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
Boxiang Sun
gitlab-ce
Commits
2099578f
Commit
2099578f
authored
Jan 03, 2019
by
mortyccp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert changes
parent
0e061adf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+1
-1
No files found.
lib/gitlab/auth.rb
View file @
2099578f
...
@@ -169,7 +169,6 @@ module Gitlab
...
@@ -169,7 +169,6 @@ module Gitlab
AccessTokenValidationService
.
new
(
token
).
include_any_scope?
(
scopes
)
AccessTokenValidationService
.
new
(
token
).
include_any_scope?
(
scopes
)
end
end
# rubocop: disable CodeReuse/ActiveRecord
def
abilities_for_scopes
(
scopes
)
def
abilities_for_scopes
(
scopes
)
abilities_by_scope
=
{
abilities_by_scope
=
{
api:
full_authentication_abilities
,
api:
full_authentication_abilities
,
...
@@ -182,6 +181,7 @@ module Gitlab
...
@@ -182,6 +181,7 @@ module Gitlab
end
.
uniq
end
.
uniq
end
end
# rubocop: disable CodeReuse/ActiveRecord
def
deploy_token_check
(
login
,
password
)
def
deploy_token_check
(
login
,
password
)
return
unless
password
.
present?
return
unless
password
.
present?
...
...
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