diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-22 11:30:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 11:30:22 +0100 |
| commit | da70aca28eaa68f21c450c8f7b6ecb6168d29941 (patch) | |
| tree | 01c10a21ba03c91202ab78b87ab66c997e7522f7 /app | |
| parent | 6f531d140b8398a4680567934fe66cb0ca465fbc (diff) | |
Restore username validation to disallow dots, for now (#6863)
Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index c88c6ec44..9a83d979f 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -69,7 +69,7 @@ class Account < ApplicationRecord validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? } # Local user validations - validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } + validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? } validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? } validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? } |