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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c1fae7b29d5d3dc002f52db3adcb5a30b4e9c330..25a30bf40099b15ac1326ca0bcccd3568322472c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,6 +13,7 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
+    - 'app/controllers/api/traces_controller.rb'
     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'
@@ -28,7 +29,7 @@ Lint/AssignmentInCondition:
 # Offense count: 4
 Lint/HandleExceptions:
   Exclude:
-    - 'app/controllers/amf_controller.rb'
+    - 'app/controllers/api/amf_controller.rb'
     - 'app/controllers/users_controller.rb'
 
 # Offense count: 692