diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 06:15:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 06:15:55 +0200 |
| commit | 4be626734dfe5d5bb550b117d966aa3f93d0ef38 (patch) | |
| tree | ab558edfd645052e92881137fdd95a66c1e4eb03 /app/models/user.rb | |
| parent | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (diff) | |
| parent | 448ed92f76981f40d6faf48ed9d798ee716a04b2 (diff) | |
Merge pull request #1827 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 ffad4ae5a..46f66526e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -94,7 +94,7 @@ class User < ApplicationRecord validates :invite_request, presence: true, on: :create, if: :invite_text_required? validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? - validates_with BlacklistedEmailValidator, if: -> { !confirmed? } + validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? } validates_with EmailMxValidator, if: :validate_email_dns? validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create |