diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-04 08:47:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-04 08:47:18 +0000 |
| commit | 5cab9d6fd88eecbac52424e3b392e7b75d98507b (patch) | |
| tree | f319817c2c78e923a0ee781d5b879a615a9f0ca1 /lib | |
| parent | d7c50b4a95b5530ae0e2f5249cfd9a419dd940c6 (diff) | |
| parent | e1c48f1431b5f7232747e608ee721b076765f12f (diff) | |
| download | gitlab-ce-5cab9d6fd88eecbac52424e3b392e7b75d98507b.tar.gz | |
Merge branch 'jastkand/gitlab-ce-fix-api-auth' into 'master'
Jastkand/gitlab ce fix api auth
Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/209
See merge request !1232
Diffstat (limited to 'lib')
| -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 ae33c529b93..30509528b8b 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.by_login(login) # If no user is found, or it's an LDAP server, try LDAP. # LDAP users are only authenticated via LDAP |