diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-09 17:59:47 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-09 18:15:35 +0100 |
| commit | b3635ee46a1e62d72ce84871e2a5984e6eabfbdf (patch) | |
| tree | da9f077646a7baa0b0aee9f7c2412fe271ac9814 /app/models/application_setting.rb | |
| parent | b34963bc125d11af7b9c993d1233258f084e580d (diff) | |
| download | gitlab-ce-streamline-email-validation.tar.gz | |
Re-add EmailValidator to avoid the repetition of format: { with: Devise.email_regexp }streamline-email-validation
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index ac6653f5d50..269056e0e77 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -71,7 +71,7 @@ class ApplicationSetting < ActiveRecord::Base url: true validates :admin_notification_email, - format: { with: Devise.email_regexp }, + email: true, allow_blank: true validates :two_factor_grace_period, |