summaryrefslogtreecommitdiff
path: root/lib/api/session.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-06-10 14:51:16 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-06-10 14:51:16 +0200
commit0e896ffe4eebb8bcf04bc1327d498bb041faed56 (patch)
tree78a0e64cba51421b5164c7479099a9b2a0c13790 /lib/api/session.rb
parentcfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff)
downloadgitlab-ce-0e896ffe4eebb8bcf04bc1327d498bb041faed56.tar.gz
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/api/session.rb')
-rw-r--r--lib/api/session.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb
index 56e69b2366f..56c202f1294 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,7 +11,7 @@ module API
# Example Request:
# POST /session
post "/session" do
- user = Gitlab::Auth.find_in_gitlab_or_ldap(params[:email] || params[:login], params[:password])
+ user = Gitlab::Auth.find_with_user_password(params[:email] || params[:login], params[:password])
return unauthorized! unless user
present user, with: Entities::UserLogin