rubocop: move Style/IdenticalConditionalBranches files from .rubocop_todo.yml to...

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 8fe639e80061f2e633e15b28d830c315598023e5..0381fc488e87ca7322699b3a388c15f9fd3b0f54 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -86,3 +86,8 @@ Style/FrozenStringLiteralComment:
 Style/HashSyntax:
   Enabled: true
   EnforcedStyle: no_mixed_keys
+
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'config/initializers/10-patches.rb'
+    - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5d663a93e3bb43be03a5c17923dbe10cca301ce3..56550bfac002eaea09e255aac19104df5e54faf5 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1078,11 +1078,6 @@ Style/GlobalVars:
 Style/GuardClause:
   Enabled: false
 
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'config/initializers/10-patches.rb'
-    - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
-
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Enabled: false