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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index dc7590df36d3ee5353256fe2f308af287ae0443c..c0f0c1fa08053ec082a77ae9cd8e6e3d0facb874 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,13 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
 require:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
@@ -43,9 +45,16 @@ Naming/FileName:
 Naming/MethodParameterName:
   Enabled: false
 
+# This conflicts with Strong Migrations, which can't check `change_table`
+Rails/BulkChangeTable:
+  Enabled: false
+
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/FindBy:
+  IgnoreWhereFirst: false
+
 Rails/FindEach:
   Enabled: false
 
@@ -96,12 +105,6 @@ Style/MixinUsage:
     - 'bin/setup'
     - 'bin/update'
 
-Style/RedundantCondition:
-  Exclude:
-    - 'app/controllers/messages_controller.rb'
-    - 'app/controllers/sessions_controller.rb'
-    - 'app/controllers/users_controller.rb'
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes