diff options
author | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2018-10-27 00:39:00 +0200 |
---|---|---|
committer | Horatiu Eugen Vlad <horatiu@vlad.eu> | 2019-03-05 19:56:01 +0000 |
commit | c8c0ea6c52d46ce63d838d1e739355d4deace434 (patch) | |
tree | a91cbe57b1cc4235f3be6b32f2829e200c73de09 /app/models/member.rb | |
parent | 60876192f89e41494cb56e2dc0a90f5f0dbfa716 (diff) | |
download | gitlab-ce-c8c0ea6c52d46ce63d838d1e739355d4deace434.tar.gz |
Align EmailValidator to validate_email gem implementation.
Renamed EmailValidator to DeviseEmailValidator to avoid 'email:' naming collision with ActiveModel::Validations::EmailValidator in 'validates' statement.
Make use of the options attribute of the parent class ActiveModel::EachValidator.
Add more options: regex.
Diffstat (limited to 'app/models/member.rb')
-rw-r--r-- | app/models/member.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index 8e071a8ff21..5dbc0c2eec9 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -28,7 +28,7 @@ class Member < ActiveRecord::Base presence: { if: :invite? }, - email: { + devise_email: { allow_nil: true }, uniqueness: { |