diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-20 22:41:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-20 22:41:20 +0100 |
commit | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (patch) | |
tree | e4be53cb0b2e7f876bea6c61d4fe64d7586ae63d /app/validators/domain_validator.rb | |
parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
parent | dc0cc5a57d224b4c53bc58dad919b727055bd9a3 (diff) |
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/validators/domain_validator.rb')
-rw-r--r-- | app/validators/domain_validator.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/validators/domain_validator.rb b/app/validators/domain_validator.rb index 6e4a854ff..3a951f9a7 100644 --- a/app/validators/domain_validator.rb +++ b/app/validators/domain_validator.rb @@ -4,13 +4,11 @@ class DomainValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) return if value.blank? - domain = begin - if options[:acct] - value.split('@').last - else - value - end - end + domain = if options[:acct] + value.split('@').last + else + value + end record.errors.add(attribute, I18n.t('domain_validator.invalid_domain')) unless compliant?(domain) end |