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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ea957a8caa294444eaf3c715bde9abe80684f1e2..c24fa1310036264e9ab9dd06f2d99e02cfa5cd31 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -18,6 +18,7 @@ Lint/AssignmentInCondition:
     - 'app/controllers/user_preferences_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
     - 'app/models/client_application.rb'
     - 'app/mailers/notifier.rb'
     - 'lib/nominatim.rb'
@@ -141,7 +142,7 @@ Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
-    - 'app/helpers/changeset_helper.rb'
+    - 'app/helpers/changesets_helper.rb'
     - 'app/helpers/geocoder_helper.rb'
     - 'app/helpers/note_helper.rb'
     - 'app/helpers/open_graph_helper.rb'
@@ -177,7 +178,7 @@ Style/FrozenStringLiteralComment:
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
-    - 'app/controllers/way_controller.rb'
+    - 'app/controllers/ways_controller.rb'
 
 # Offense count: 70
 # Cop supports --auto-correct.