diff options
author | ThibG <thib@sitedethib.com> | 2018-08-01 15:29:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-01 15:29:35 +0200 |
commit | 20e75666b2c52be6bbc7fe3f6fbe4278f35dde15 (patch) | |
tree | ea47c70306d15e6b187ce0d37f9dd2936ee9b29d /app/models/account.rb | |
parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
parent | a0d01119794655dc789eda94905304679de070e8 (diff) |
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 4abcd438a..041eda6f4 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -70,6 +70,7 @@ class Account < ApplicationRecord # Remote user validations validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? } + validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, if: -> { !local? && will_save_change_to_username? } # Local user validations validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } |