X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e091246ffc2d640f0a7f2324998315b33b891847..6cde8c9b0c4220db3b5598a268c197e77258a8cc:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 0b0d37326..17985e05f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -88,7 +88,7 @@ class User < ActiveRecord::Base :default_url => "/assets/:class/:attachment/:style.png", :styles => { :large => "100x100>", :small => "50x50>" } - validates :display_name, :presence => true, :allow_nil => true, :length => 3..255, + validates :display_name, :presence => true, :length => 3..255, :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended] validates :display_name, :if => proc { |u| u.display_name_changed? }, :uniqueness => { :case_sensitive => false }