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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index eedbf47e0d341311dc2abd723cef53a1ef5b803b..d084946e3058b6aa6c708e24d7a5cf33e44706fc 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,18 +1,18 @@
 inherit_from: .rubocop_todo.yml
 
 plugins:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 require:
-  - rubocop-capybara
-  - rubocop-factory_bot
   - ./.rubocop/specific_action_names.rb
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
@@ -108,6 +108,10 @@ Style/MixinUsage:
     - 'bin/setup'
     - 'bin/update'
 
+Style/RaiseArgs:
+  Exclude:
+    - 'lib/osm.rb'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
@@ -129,7 +133,6 @@ Rails/SpecificActionNames:
     - app/controllers/**/*.rb
   Exclude:
     # 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/notes_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'