Changed User model to not allow nil display_name (w/ tests)

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 0b0d37326a2c8b6b0b9d31849492eb71fcf04825..17985e05f45d1ad56d126b2886d5b20b81f5db48 100644 (file)
--- 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 }