Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
19e5b043
Commit
19e5b043
authored
Jun 16, 2015
by
swellard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix duplicate 'Email has already been taken' message when creating a user, updated comments
parent
98615ef5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/user.rb
app/models/user.rb
+1
-1
No files found.
app/models/user.rb
View file @
19e5b043
...
@@ -138,7 +138,7 @@ class User < ActiveRecord::Base
...
@@ -138,7 +138,7 @@ class User < ActiveRecord::Base
#
#
validates
:name
,
presence:
true
validates
:name
,
presence:
true
# Note that a 'uniqueness' and presence check is provided by devise :validatable for email. We do not need to
# Note that a 'uniqueness' and presence check is provided by devise :validatable for email. We do not need to
# duplicate that here as the validation framework will have duplicate errors in the event of a failure
# duplicate that here as the validation framework will have duplicate errors in the event of a failure
.
validates
:email
,
presence:
true
,
email:
{
strict_mode:
true
}
validates
:email
,
presence:
true
,
email:
{
strict_mode:
true
}
validates
:notification_email
,
presence:
true
,
email:
{
strict_mode:
true
}
validates
:notification_email
,
presence:
true
,
email:
{
strict_mode:
true
}
validates
:public_email
,
presence:
true
,
email:
{
strict_mode:
true
},
allow_blank:
true
,
uniqueness:
true
validates
:public_email
,
presence:
true
,
email:
{
strict_mode:
true
},
allow_blank:
true
,
uniqueness:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment