summaryrefslogtreecommitdiff
path: root/app/models/member.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-09 17:59:47 +0100
committerRémy Coutable <remy@rymai.me>2016-02-09 18:15:35 +0100
commitb3635ee46a1e62d72ce84871e2a5984e6eabfbdf (patch)
treeda9f077646a7baa0b0aee9f7c2412fe271ac9814 /app/models/member.rb
parentb34963bc125d11af7b9c993d1233258f084e580d (diff)
downloadgitlab-ce-b3635ee46a1e62d72ce84871e2a5984e6eabfbdf.tar.gz
Re-add EmailValidator to avoid the repetition of format: { with: Devise.email_regexp }streamline-email-validation
Diffstat (limited to 'app/models/member.rb')
-rw-r--r--app/models/member.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 0b6785ddbc5..ca08007b7eb 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -38,8 +38,7 @@ class Member < ActiveRecord::Base
presence: {
if: :invite?
},
- format: {
- with: Devise.email_regexp,
+ email: {
allow_nil: true
},
uniqueness: {