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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index d1b961dd5c66c2325a99c7782cc34f2dc859c865..eedbf47e0d341311dc2abd723cef53a1ef5b803b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,14 @@
 inherit_from: .rubocop_todo.yml
 
-require:
-  - rubocop-capybara
-  - rubocop-factory_bot
+plugins:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
+
+require:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - ./.rubocop/specific_action_names.rb
 
 AllCops:
@@ -129,13 +131,9 @@ Rails/SpecificActionNames:
     # This is a todo list, but is currently too long for `rubocop --auto-gen-config`
     - 'app/controllers/api/changeset_comments_controller.rb'
     - 'app/controllers/api/changesets_controller.rb'
-    - 'app/controllers/api/nodes_controller.rb'
     - 'app/controllers/api/notes_controller.rb'
-    - 'app/controllers/api/old_elements_controller.rb'
-    - 'app/controllers/api/relations_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'
     - 'app/controllers/api/users_controller.rb'
-    - 'app/controllers/api/ways_controller.rb'
     - 'app/controllers/browse_controller.rb'
     - 'app/controllers/changesets_controller.rb'
     - 'app/controllers/confirmations_controller.rb'
@@ -146,7 +144,6 @@ Rails/SpecificActionNames:
     - 'app/controllers/export_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/issues_controller.rb'
-    - 'app/controllers/messages_controller.rb'
     - 'app/controllers/site_controller.rb'
     - 'app/controllers/traces_controller.rb'
     - 'app/controllers/users_controller.rb'