diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-10 15:51:16 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-10 15:51:16 +0300 |
| commit | 0e896ffe4eebb8bcf04bc1327d498bb041faed56 (patch) | |
| tree | 78a0e64cba51421b5164c7479099a9b2a0c13790 /lib/gitlab/backend/grack_auth.rb | |
| parent | cfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff) | |
Improve Gitlab::Auth method names
Auth.find was a very generic name for a very specific method.
Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also
looks in Kerberos.
Diffstat (limited to 'lib/gitlab/backend/grack_auth.rb')
| -rw-r--r-- | lib/gitlab/backend/grack_auth.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index 9e09d2e118d..adbf5941a96 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -95,7 +95,7 @@ module Grack end def authenticate_user(login, password) - user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password) + user = Gitlab::Auth.find_with_user_password(login, password) unless user user = oauth_access_token_check(login, password) |