summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 14:36:28 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 14:36:28 +0200
commit53bf080f676a70cfa18851727c42883fe3a83c55 (patch)
tree8c297b08bde8b0814dfbcf284b6d2adc2a4e2878
parent43c35b0f20fb3bb67ea2b96bf8f806c7e95b6aec (diff)
downloadgitlab-ce-rubocop/enable-space-before-comment-cop.tar.gz
Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-cop
See #17478
-rw-r--r--.rubocop.yml2
-rw-r--r--config/initializers/doorkeeper.rb2
-rw-r--r--lib/event_filter.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..7c0f7d87cbd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -574,7 +574,7 @@ Style/SpaceBeforeComma:
# Checks for missing space between code and a comment on the same line.
Style/SpaceBeforeComment:
- Enabled: false
+ Enabled: true
# Checks that exactly one space is used between a method name and the first
# argument for method calls without parentheses.
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 66ac88e9f4a..393ad909b45 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -71,7 +71,7 @@ Doorkeeper.configure do
# The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
# (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
#
- native_redirect_uri nil#'urn:ietf:wg:oauth:2.0:oob'
+ native_redirect_uri nil # 'urn:ietf:wg:oauth:2.0:oob'
# Specify what grant flows are enabled in array of Strings. The valid
# strings and the flows they enable are:
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index f15b2cfd231..668d2fa41b3 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -27,7 +27,7 @@ class EventFilter
@params = if params
params.dup
else
- []#EventFilter.default_filter
+ [] # EventFilter.default_filter
end
end