diff options
author | swellard <swellard@perforce.com> | 2015-06-16 11:46:32 +0100 |
---|---|---|
committer | swellard <swellard@perforce.com> | 2015-06-16 14:24:05 +0100 |
commit | 19e5b043fe3bd54cbe76d666205271683b63a64f (patch) | |
tree | 465fd545d08cb2aab1d1a557662289ab9c9104df /app/models | |
parent | 98615ef536186d2aff95c02246ef30254ab9b1f2 (diff) | |
download | gitlab-ce-19e5b043fe3bd54cbe76d666205271683b63a64f.tar.gz |
Fix duplicate 'Email has already been taken' message when creating a user, updated comments
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 25b46da2aaf..982c05212ce 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -138,7 +138,7 @@ class User < ActiveRecord::Base # validates :name, presence: true # 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 :notification_email, presence: true, email: { strict_mode: true } validates :public_email, presence: true, email: { strict_mode: true }, allow_blank: true, uniqueness: true |