X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d0b845fc6025f2fb84a4cf4fa10cbb71084843a7..d24d7e3bf767d94a5388b751348a13ae2f89d831:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 683fcc96b..308e0a2ce 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,8 +12,8 @@ class User < ActiveRecord::Base has_many :changesets validates_presence_of :email, :display_name - validates_confirmation_of :email, :message => 'Email addresses must match' - validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password' + validates_confirmation_of :email#, :message => ' addresses must match' + validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password' validates_uniqueness_of :display_name, :allow_nil => true validates_uniqueness_of :email validates_length_of :pass_crypt, :within => 8..255