From f7a30e2fae3199a82e2ad23bb9d761d1fe1be8de Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 5 Jun 2017 01:03:45 +0200 Subject: Added support for configurable reserved usernames (fix of #1382) (#3566) * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames --- app/models/account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/account.rb') diff --git a/app/models/account.rb b/app/models/account.rb index 5b0d2d65c..918d5b0f1 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -56,7 +56,7 @@ class Account < ApplicationRecord # Local user validations with_options if: :local? do - validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 } + validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, unreserved: true validates :display_name, length: { maximum: 30 } validates :note, length: { maximum: 160 } end -- cgit