Merge remote-tracking branch 'upstream/pull/2858'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 87bf43bc3b07c9b10f37aad04189693b807a66e3..61109ddc9b7320ae231dd71692ff57edd3685265 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -188,11 +188,6 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Enabled: false
 
-# Offense count: 1
-Style/CombinableLoops:
-  Exclude:
-    - 'db/migrate/021_move_to_innodb.rb'
-
 # Offense count: 572
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -222,16 +217,6 @@ Style/OptionalBooleanParameter:
     - 'test/models/trace_test.rb'
     - 'test/models/tracetag_test.rb'
 
-# Offense count: 6
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'app/controllers/user_blocks_controller.rb'
-    - 'app/models/old_way.rb'
-    - 'app/validators/characters_validator.rb'
-    - 'app/validators/whitespace_validator.rb'
-    - 'lib/classic_pagination/pagination.rb'
-
 # Offense count: 28
 # Cop supports --auto-correct.
 Style/StringConcatenation: