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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7232d199b03b52a27137d55691389f75b6413f87..35107e9b9b2ea961b3949d10ec50b4caef6ba16d 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'
@@ -52,7 +53,7 @@ Metrics/ClassLength:
 
 # Offense count: 72
 Metrics/CyclomaticComplexity:
-  Max: 20
+  Max: 23
 
 # Offense count: 691
 # Configuration parameters: CountComments.
@@ -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'