X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8dae890a7645fba17a44d84f78be03d993e22ccb..98de681e4711ad3bf5526e511002c8f0e91860a8:/.rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f03767698..da801d681 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,9 +33,9 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
-    - 'app/controllers/trace_controller.rb'
+    - 'app/controllers/traces_controller.rb'
     - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/user_preferences_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
     - 'app/models/client_application.rb'
@@ -55,11 +55,6 @@ Lint/InterpolationCheck:
   Exclude:
     - 'test/controllers/node_controller_test.rb'
 
-# Offense count: 2
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
-
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
@@ -72,7 +67,7 @@ Metrics/AbcSize:
 # Offense count: 41
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 240
+  Max: 257
 
 # Offense count: 12
 # Configuration parameters: CountBlocks.
@@ -82,7 +77,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1790
+  Max: 1797
 
 # Offense count: 71
 Metrics/CyclomaticComplexity:
@@ -229,7 +224,6 @@ Style/RaiseArgs:
   Enabled: false
 
 # Offense count: 2
-# Cop supports --auto-correct.
-Style/RescueModifier:
+Style/RescueStandardError:
   Exclude:
     - 'app/helpers/browse_helper.rb'