summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 18:50:26 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commitb2da4623089e4c7c53526436bd7c0a8f516910a3 (patch)
tree9df8f001baee22522c7b278ff47d60ffca834285
parentbaafd8de26507ebd76177b5c65b5da921445ddc9 (diff)
downloadgitlab-ce-b2da4623089e4c7c53526436bd7c0a8f516910a3.tar.gz
Disable Style/BracesAroundHashParameters
-rw-r--r--.rubocop.yml4
-rw-r--r--.rubocop_todo.yml7
2 files changed, 3 insertions, 8 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 396a760da91..219dcf0375d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -952,7 +952,9 @@ Style/AlignParameters:
Style/BarePercentLiterals:
Enabled: true
- EnforcedStyle: bare_percent
+
+Style/BracesAroundHashParameters:
+ Enabled: false
Style/CaseEquality:
Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 12439d7bff6..92c0934b05b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -38,13 +38,6 @@ RSpec/SingleArgumentMessageChain:
Exclude:
- 'spec/requests/api/internal_spec.rb'
-# Offense count: 399
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
- Enabled: false
-
# Offense count: 33
# Cop supports --auto-correct.
Style/ColonMethodCall: