summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml3
-rw-r--r--.rubocop_todo.yml16
2 files changed, 3 insertions, 16 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 22b3e0687..07d9f511b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -92,3 +92,6 @@ Style/IdenticalConditionalBranches:
Exclude:
- 'config/initializers/10-patches.rb'
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
+
+Style/TrailingCommaInArrayLiteral:
+ Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c4c66b15d..d8b156365 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1440,22 +1440,6 @@ Style/TernaryParentheses:
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline.
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
- Exclude:
- - 'app/models/time_entry_query.rb'
- - 'test/functional/repositories_git_controller_test.rb'
- - 'test/functional/repositories_mercurial_controller_test.rb'
- - 'test/helpers/application_helper_test.rb'
- - 'test/unit/attachment_test.rb'
- - 'test/unit/custom_field_test.rb'
- - 'test/unit/lib/redmine/menu_manager/menu_helper_test.rb'
- - 'test/unit/lib/redmine/scm/adapters/git_adapter_test.rb'
- - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb'
- - 'test/unit/repository_git_test.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
Style/TrailingCommaInHashLiteral:
Enabled: false