Handle new rubocop warnings

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 05c4f63e2fe185c3b52e33a52d39a4158f7e04e4..87bf43bc3b07c9b10f37aad04189693b807a66e3 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-08-09 18:49:49 UTC using RuboCop version 0.89.0.
+# on 2020-09-02 06:16:56 UTC using RuboCop version 0.90.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -188,6 +188,11 @@ 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.
@@ -217,6 +222,16 @@ 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: