diff options
author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/models/user.rb | |
parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5a21419bf..66896257a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -73,7 +73,7 @@ class User < ApplicationRecord validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale? validates_with BlacklistedEmailValidator, if: :email_changed? - validates_with EmailMxValidator, if: :email_changed? + validates_with EmailMxValidator, if: :validate_email_dns? scope :recent, -> { order(id: :desc) } scope :admins, -> { where(admin: true) } @@ -360,4 +360,8 @@ class User < ApplicationRecord def needs_feed_update? last_sign_in_at < ACTIVE_DURATION.ago end + + def validate_email_dns? + email_changed? && !(Rails.env.test? || Rails.env.development?) + end end |