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
iv
gitlab-ce
Commits
6d444331
Commit
6d444331
authored
Jun 01, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't look for personal access tokens in the DB when the parameter/header is not passed.
parent
05b319b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-1
No files found.
app/controllers/application_controller.rb
View file @
6d444331
...
...
@@ -374,7 +374,7 @@ class ApplicationController < ActionController::Base
def
get_user_from_personal_access_token
token_string
=
params
[
:private_token
].
presence
||
request
.
headers
[
'PRIVATE-TOKEN'
].
presence
personal_access_token
=
PersonalAccessToken
.
active
.
find_by_token
(
token_string
)
personal_access_token
=
PersonalAccessToken
.
active
.
find_by_token
(
token_string
)
if
token_string
personal_access_token
.
user
if
personal_access_token
end
end
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