diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-30 15:02:56 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-30 15:02:56 +0200 |
| commit | fc5dd0c538a8cf33d007a01e168b3bfc0cdc9060 (patch) | |
| tree | 2b8b804b5fd0265f57ae87f3b0315c6c8d14c9ef /app/models/user.rb | |
| parent | 60f9973f452100475874cd9bd0a8b6ee908bf8e0 (diff) | |
| parent | 8c7223f4eac80b5725485be742d3fa2c984f4670 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 7c9ced6ae..76ad7d1b2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,11 +91,11 @@ 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, on: :create + validates_with BlacklistedEmailValidator, if: -> { !confirmed? } validates_with EmailMxValidator, if: :validate_email_dns? validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create - # Those are honeypot/antispam fields + # Honeypot/anti-spam fields attr_accessor :registration_form_time, :website, :confirm_password validates_with RegistrationFormTimeValidator, on: :create |