diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-03 23:44:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 23:44:44 +0200 |
| commit | 7cb369d4c66c4381c856a2714b4117d6204cd4bb (patch) | |
| tree | cc1eff91f4e222262d0310f42240ddb6e4191d77 /app/models/user.rb | |
| parent | d77ee3f276dc42fb0219ab1b02162f2f1b90257b (diff) | |
Change e-mail whitelist/blacklist to not be checked when invited (#10683)
* Change e-mail whitelist/blacklist to not be checked when invited And only when creating an account, not when updating it later Fix #10648 * Fix test
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 432078651..bce28aa5f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -78,7 +78,7 @@ class User < ApplicationRecord accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? } validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? - validates_with BlacklistedEmailValidator, if: :email_changed? + validates_with BlacklistedEmailValidator, on: :create validates_with EmailMxValidator, if: :validate_email_dns? validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create |