diff options
| author | skv <skv-headless@yandex.ru> | 2014-01-19 22:55:59 +0400 |
|---|---|---|
| committer | skv <skv-headless@yandex.ru> | 2014-01-19 23:39:56 +0400 |
| commit | a3f645ef51ec12ce93934b4ddb11313613d8c451 (patch) | |
| tree | f30e76940e436049aa83a8c60741bc6c2d9b7f44 /lib/gitlab/auth.rb | |
| parent | 3fe578a7fdaea8607cf98ffb1878c03fd5ac3649 (diff) | |
| download | gitlab-ce-a3f645ef51ec12ce93934b4ddb11313613d8c451.tar.gz | |
Remove deprecated finders
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 0f196297477..955abc1bedd 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -1,7 +1,7 @@ module Gitlab class Auth def find(login, password) - user = User.find_by_email(login) || User.find_by_username(login) + user = User.find_by(email: login) || User.find_by(username: login) if user.nil? || user.ldap_user? # Second chance - try LDAP authentication |