Commit 8e7e3be5 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rubocop/enable-empty-lines-around-access-modifier-cop' into 'master'

Enable Style/EmptyLinesAroundAccessModifier rubocop cop

Keep blank lines around access modifiers.

See #17478

See merge request !4452
parents 9440ac66 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: false Enabled: true
# Keeps track of empty lines around block bodies. # Keeps track of empty lines around block bodies.
Style/EmptyLinesAroundBlockBody: Style/EmptyLinesAroundBlockBody:
......
...@@ -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)
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment