diff options
| author | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-09-11 23:44:46 +0400 |
|---|---|---|
| committer | Evgeny Mandrikov <mandrikov@gmail.com> | 2011-09-11 23:53:44 +0400 |
| commit | ae800aa8330e60a6c7792cee1e434851208afdde (patch) | |
| tree | 53b0a179abd49245ed3c145a9d0d420ea664cff8 /sonar-server/src | |
| parent | 6f77b0e2d26cf3156ba06677633df33e90ccc4e6 (diff) | |
| download | sonarqube-ae800aa8330e60a6c7792cee1e434851208afdde.tar.gz sonarqube-ae800aa8330e60a6c7792cee1e434851208afdde.zip | |
SONAR-2656 Do not validate password twice
Diffstat (limited to 'sonar-server/src')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/models/user.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 7635670b6b0..ac04601fe30 100644 --- 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 |