diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
| commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
| tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /app/models | |
| parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
| parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9bdf8807f..ef48282fd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -65,6 +65,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? scope :recent, -> { order(id: :desc) } scope :admins, -> { where(admin: true) } |