rubocop: disable Style/TrailingCommaInArrayLiteral

git-svn-id: http://svn.redmine.org/redmine/trunk@18689 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop.yml b/.rubocop.yml
index 22b3e0687e3a051613ec559709d0bd73913b3418..07d9f511b886b88c0de057bcd869e19b09627837 100644 (file)
--- 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 c4c66b15d2fe0466617613a264784d3185fad6fe..d8b15636552383c3e97148c505b4245490490461 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1437,22 +1437,6 @@ Style/SymbolProc:
 Style/TernaryParentheses:
   Enabled: false
 
-# 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