Merge branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +02:00
parent 8b98afa781 90908fc24b
commit c087738270
37 changed files with 553 additions and 93 deletions
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -4,7 +4,7 @@ require 'resolv'

 class EmailMxValidator < ActiveModel::Validator
  def validate(user)
-    return if Rails.env.test?
+    return if Rails.env.test? || Rails.env.development?
    user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email)
  end