summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-06-03 17:08:44 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-06-03 17:08:44 +0200
commit1fab583266af0904dfc29facfe4551e37c06342a (patch)
treecbff624240a864a3fd64881c8008d01cd89910e4
parentfa35aea3ddf1093db26f8b7fec78175a5f88af7a (diff)
downloadgitlab-ce-1fab583266af0904dfc29facfe4551e37c06342a.tar.gz
Remove instances of Auth.new
-rw-r--r--app/controllers/jwt_controller.rb2
-rw-r--r--lib/gitlab/backend/grack_auth.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index cee3b6c43e7..c05a55633b5 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -45,7 +45,7 @@ class JwtController < ApplicationController
# TODO: this is a copy and paste from grack_auth,
# it should be refactored in the future
- user = Gitlab::Auth.new.find(login, password)
+ user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
# If the user authenticated successfully, we reset the auth failure count
# from Rack::Attack for that IP. A client may attempt to authenticate
diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 492ffb138a3..9e09d2e118d 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.new.find_in_gitlab_or_ldap(login, password)
+ user = Gitlab::Auth.find_in_gitlab_or_ldap(login, password)
unless user
user = oauth_access_token_check(login, password)