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
e052daa0
Commit
e052daa0
authored
Jun 03, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/EmptyLinesAroundAccessModifier rubocop cop
See #17478
parent
ae5f17ae
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
.rubocop.yml
.rubocop.yml
+1
-1
app/services/oauth2/access_token_validation_service.rb
app/services/oauth2/access_token_validation_service.rb
+1
-0
lib/gitlab/ldap/config.rb
lib/gitlab/ldap/config.rb
+1
-0
No files found.
.rubocop.yml
View file @
e052daa0
...
@@ -194,7 +194,7 @@ Style/EmptyLines:
...
@@ -194,7 +194,7 @@ Style/EmptyLines:
# Keep blank lines around access modifiers.
# Keep blank lines around access modifiers.
Style/EmptyLinesAroundAccessModifier
:
Style/EmptyLinesAroundAccessModifier
:
Enabled
:
fals
e
Enabled
:
tru
e
# Keeps track of empty lines around block bodies.
# Keeps track of empty lines around block bodies.
Style/EmptyLinesAroundBlockBody
:
Style/EmptyLinesAroundBlockBody
:
...
...
app/services/oauth2/access_token_validation_service.rb
View file @
e052daa0
...
@@ -22,6 +22,7 @@ module Oauth2::AccessTokenValidationService
...
@@ -22,6 +22,7 @@ module Oauth2::AccessTokenValidationService
end
end
protected
protected
# True if the token's scope is a superset of required scopes,
# True if the token's scope is a superset of required scopes,
# or the required scopes is empty.
# or the required scopes is empty.
def
sufficient_scope?
(
token
,
scopes
)
def
sufficient_scope?
(
token
,
scopes
)
...
...
lib/gitlab/ldap/config.rb
View file @
e052daa0
...
@@ -93,6 +93,7 @@ module Gitlab
...
@@ -93,6 +93,7 @@ module Gitlab
end
end
protected
protected
def
base_config
def
base_config
Gitlab
.
config
.
ldap
Gitlab
.
config
.
ldap
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