diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-05-18 21:11:23 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-19 03:11:23 +0200 |
| commit | 6e4c7d62118d5d1f2e966950edfdbc80cebd4d7c (patch) | |
| tree | 886a8215d03ab975211a463bd33aee1331cc7bb9 /app/models/account.rb | |
| parent | d2542dcec0dafa8878efd2bd4fe53bd80256aa60 (diff) | |
Conditional validations no longer accept strings for if/unless (#3124)
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index f418a0f8b..726e6c127 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -52,10 +52,10 @@ class Account < ApplicationRecord has_one :user, inverse_of: :account validates :username, presence: true - validates :username, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' + validates :username, uniqueness: { scope: :domain, case_sensitive: true }, unless: :local? # Local user validations - with_options if: 'local?' do + 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 :display_name, length: { maximum: 30 } validates :note, length: { maximum: 160 } |