Small fix

changs · Mar 26, 2012 · 5c8a716 · 5c8a716
1 parent dff5cc8
commit 5c8a716
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,9 +27,9 @@ class User < ActiveRecord::Base
   validates :username, presence: true, length: { maximum: 20 },
     uniqueness: { case_sensitive: false }
   validates :fullname, presence: true, length: { maximum: 30 }
-  validates :email, format: { with: email_regex },
-    uniqueness: { case_sensitive: false }, length: { maximum: 30 }
-  validates :password, length: { in: 5..25 }, :on => :creation
+  validates :email, presence: true, format: { with: email_regex },
+    uniqueness: { case_sensitive: false }
+  validates :password, length: { in: 5..25 }
 
   def generate_token(column)
     begin