diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 05:07:39 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 05:07:39 +0200 |
| commit | 2d1d4210f9d394ea8e7357df08f8ca2cc925384a (patch) | |
| tree | a5c69693d11b59a673b1981ea2d85bbc17991c42 /app/models/user.rb | |
| parent | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (diff) | |
| parent | 861b35dd54d266bc0a40b3cacb28e5b82ff6faaa (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
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 |