Commit 19e5b043 authored by swellard's avatar swellard

Fix duplicate 'Email has already been taken' message when creating a user, updated comments

parent 98615ef5
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment