summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:34:50 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:56 -0600
commitb664a542042fc9b31849bb074f821bc0d1ff5d92 (patch)
tree1eae03a124af25dc147117208408f547b94e1904
parentc10064aad5d0e4ca1981fd898a6688e42ea8c9d0 (diff)
downloadgitlab-ce-b664a542042fc9b31849bb074f821bc0d1ff5d92.tar.gz
Disable Style/TrailingCommaInLiteral
-rw-r--r--.rubocop.yml3
-rw-r--r--.rubocop_todo.yml7
2 files changed, 3 insertions, 7 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index cd120e8581c..5d89b73fe2b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -452,6 +452,9 @@ Style/Tab:
Style/TrailingBlankLines:
Enabled: true
+Style/TrailingCommaInLiteral:
+ Enabled: false
+
# Checks for %W when interpolation is not needed.
Style/UnneededCapitalW:
Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4da79899831..d065b246050 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -794,13 +794,6 @@ Style/TernaryParentheses:
Style/TrailingCommaInArguments:
Enabled: false
-# Offense count: 158
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-# SupportedStyles: comma, consistent_comma, no_comma
-Style/TrailingCommaInLiteral:
- Enabled: false
-
# Offense count: 7
# Cop supports --auto-correct.
# Configuration parameters: AllowNamedUnderscoreVariables.