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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4041eb77
Commit
4041eb77
authored
Jul 11, 2020
by
Giorgenes Gelatti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE Api guard
parent
e30e8657
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
ee/lib/ee/api/api_guard.rb
ee/lib/ee/api/api_guard.rb
+0
-19
lib/api/api_guard.rb
lib/api/api_guard.rb
+0
-2
No files found.
ee/lib/ee/api/api_guard.rb
deleted
100644 → 0
View file @
e30e8657
# frozen_string_literal: true
module
EE
module
API
module
APIGuard
module
HelperMethods
extend
::
Gitlab
::
Utils
::
Override
override
:find_user_from_sources
def
find_user_from_sources
deploy_token_from_request
||
find_user_from_bearer_token
||
find_user_from_job_token
||
find_user_from_warden
end
end
end
end
end
lib/api/api_guard.rb
View file @
4041eb77
...
...
@@ -43,7 +43,6 @@ module API
# Helper Methods for Grape Endpoint
module
HelperMethods
prepend_if_ee
(
'EE::API::APIGuard::HelperMethods'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
Gitlab
::
Auth
::
AuthFinders
def
access_token
...
...
@@ -66,7 +65,6 @@ module API
def
find_user_from_sources
deploy_token_from_request
||
find_user_from_access_token
||
find_user_from_bearer_token
||
find_user_from_job_token
||
find_user_from_warden
...
...
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