diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-03 16:35:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-03 16:35:34 +0000 |
| commit | 8e7e3be5a1c1184a7a60145420eb9733396f9dee (patch) | |
| tree | a2028c9e28ee1bee4c85f02f1e790e591f408b1d | |
| parent | 9440ac669ff1fcb37404094cd73e2e038c141ae0 (diff) | |
| parent | e052daa08adecf74d6ac85c7a8bf6cb7743b8d93 (diff) | |
| download | gitlab-ce-8e7e3be5a1c1184a7a60145420eb9733396f9dee.tar.gz | |
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
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | app/services/oauth2/access_token_validation_service.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 84a8015b410..3593ae29f24 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -194,7 +194,7 @@ Style/EmptyLines: # Keep blank lines around access modifiers. Style/EmptyLinesAroundAccessModifier: - Enabled: false + Enabled: true # Keeps track of empty lines around block bodies. Style/EmptyLinesAroundBlockBody: diff --git a/app/services/oauth2/access_token_validation_service.rb b/app/services/oauth2/access_token_validation_service.rb index 6194f6ce91e..264fdccde8f 100644 --- a/app/services/oauth2/access_token_validation_service.rb +++ b/app/services/oauth2/access_token_validation_service.rb @@ -22,6 +22,7 @@ module Oauth2::AccessTokenValidationService end protected + # True if the token's scope is a superset of required scopes, # or the required scopes is empty. def sufficient_scope?(token, scopes) diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index aff7ccb157f..f9bb5775323 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -93,6 +93,7 @@ module Gitlab end protected + def base_config Gitlab.config.ldap end |