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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c3c8cc7b4b6cf7188814366be0c692f3844e679f..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/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'
     - 'app/models/client_application.rb'
     - 'app/mailers/notifier.rb'
     - 'lib/nominatim.rb'