X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b4ef61a9f31ac8bb911c094bc2fb00a9fa2102a6..d73a5d4bc015d304e7b8863a0e927ac0b134e07b:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index a57c88379..27ed7b648 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -93,10 +93,9 @@ class User < ActiveRecord::Base
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :uniqueness => { :case_sensitive => false }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :invalid_chars => true,
-                           :invalid_url_chars => true,
+                           :characters => { :url_safe => true },
                            :whitespace => { :leading => false, :trailing => false }
-  validates :email, :presence => true, :confirmation => true, :invalid_chars => true
+  validates :email, :presence => true, :confirmation => true, :characters => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }
   validates :pass_crypt, :confirmation => true, :length => 8..255