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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cdac8fd6718a4688403694f9ec1be7e6b917e2a4..6bff1b0983e5ce98b6e025814a2c6c1b5f3ad2b9 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,7 +33,7 @@ Lint/AssignmentInCondition:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
-    - 'app/controllers/trace_controller.rb'
+    - 'app/controllers/traces_controller.rb'
     - 'app/controllers/user_controller.rb'
     - 'app/controllers/user_preferences_controller.rb'
     - 'app/helpers/application_helper.rb'