SONAR-2656 Do not validate password twice

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
index 7635670b6b079e136d30362e652a8d5e0fd0533f..ac04601fe302250fb2237f2aac10bc4b83a9744b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
@@ -41,8 +41,9 @@ class User < ActiveRecord::Base
   validates_length_of       :name, :maximum => 200, :allow_blank => true, :allow_nil => true
   validates_length_of       :email, :maximum => 100, :allow_blank => true, :allow_nil => true
 
-  validates_length_of       :password, :within => 4..40, :if => :password_required?
-  validates_confirmation_of :password, :if => :password_required?
+  # The following two validations not needed, because they come with Authentication::ByPassword - see SONAR-2656
+  #validates_length_of       :password, :within => 4..40, :if => :password_required?
+  #validates_confirmation_of :password, :if => :password_required?
 
   validates_presence_of     :login
   validates_length_of       :login,    :within => 2..40