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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 071abc44c37d72262c8765515e88725fb1618ffb..b3379b91a14243fec617620f973a8f5c3aaa8db7 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -27,6 +27,8 @@ FactoryBot/ExcessiveCreateList:
     - 'test/controllers/notes_controller_test.rb'
     - 'test/controllers/traces_controller_test.rb'
     - 'test/controllers/user_blocks_controller_test.rb'
     - 'test/controllers/notes_controller_test.rb'
     - 'test/controllers/traces_controller_test.rb'
     - 'test/controllers/user_blocks_controller_test.rb'

+    - 'test/controllers/users/issued_blocks_controller_test.rb'
+    - 'test/controllers/users/received_blocks_controller_test.rb'

     - 'test/system/users_test.rb'
 
 # Offense count: 635
     - 'test/system/users_test.rb'
 
 # Offense count: 635


@@ -50,7 +52,6 @@ Lint/AssignmentInCondition:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/mailers/user_mailer.rb'
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/mailers/user_mailer.rb'

-    - 'app/models/client_application.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'