Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
1fab5832
Commit
1fab5832
authored
Jun 03, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove instances of Auth.new
parent
fa35aea3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/jwt_controller.rb
app/controllers/jwt_controller.rb
+1
-1
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+1
-1
No files found.
app/controllers/jwt_controller.rb
View file @
1fab5832
...
@@ -45,7 +45,7 @@ class JwtController < ApplicationController
...
@@ -45,7 +45,7 @@ class JwtController < ApplicationController
# TODO: this is a copy and paste from grack_auth,
# TODO: this is a copy and paste from grack_auth,
# it should be refactored in the future
# 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
# If the user authenticated successfully, we reset the auth failure count
# from Rack::Attack for that IP. A client may attempt to authenticate
# from Rack::Attack for that IP. A client may attempt to authenticate
...
...
lib/gitlab/backend/grack_auth.rb
View file @
1fab5832
...
@@ -95,7 +95,7 @@ module Grack
...
@@ -95,7 +95,7 @@ module Grack
end
end
def
authenticate_user
(
login
,
password
)
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
unless
user
user
=
oauth_access_token_check
(
login
,
password
)
user
=
oauth_access_token_check
(
login
,
password
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment