Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d15d23721cb8dc10537bd1289bd4796a824d1f1b..cdac8fd6718a4688403694f9ec1be7e6b917e2a4 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -35,7 +35,7 @@ Lint/AssignmentInCondition:
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/trace_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:
@@ -227,3 +222,8 @@ Style/NumericLiterals:
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
+
+# Offense count: 2
+Style/RescueStandardError:
+  Exclude:
+    - 'app/helpers/browse_helper.rb'