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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 946dace609ffb24bde6534426a7f7e4b37397f1c..eedbf47e0d341311dc2abd723cef53a1ef5b803b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,14 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

-require:
-  - rubocop-capybara
-  - rubocop-factory_bot
+plugins:

   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake

+
+require:
+  - rubocop-capybara
+  - rubocop-factory_bot

   - ./.rubocop/specific_action_names.rb
 
 AllCops:
   - ./.rubocop/specific_action_names.rb
 
 AllCops:


@@ -130,7 +132,6 @@ Rails/SpecificActionNames:
     - 'app/controllers/api/changeset_comments_controller.rb'
     - 'app/controllers/api/changesets_controller.rb'
     - 'app/controllers/api/notes_controller.rb'
     - 'app/controllers/api/changeset_comments_controller.rb'
     - 'app/controllers/api/changesets_controller.rb'
     - 'app/controllers/api/notes_controller.rb'

-    - 'app/controllers/api/old_elements_controller.rb'

     - 'app/controllers/api/user_preferences_controller.rb'
     - 'app/controllers/api/users_controller.rb'
     - 'app/controllers/browse_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'
     - 'app/controllers/api/users_controller.rb'
     - 'app/controllers/browse_controller.rb'