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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index cfa31cc048d6423973cd42b78d6ad7d000a63c1b..c0f0c1fa08053ec082a77ae9cd8e6e3d0facb874 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,13 +2,14 @@ inherit_from: .rubocop_todo.yml
 
 require:
   - rubocop-capybara
 
 require:
   - rubocop-capybara

+  - rubocop-factory_bot

   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
 
 AllCops:

-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0

   NewCops: enable
   Exclude:
     - 'vendor/**/*'
   NewCops: enable
   Exclude:
     - 'vendor/**/*'


@@ -44,9 +45,16 @@ Naming/FileName:
 Naming/MethodParameterName:
   Enabled: false
 
 Naming/MethodParameterName:
   Enabled: false
 

+# This conflicts with Strong Migrations, which can't check `change_table`
+Rails/BulkChangeTable:
+  Enabled: false
+

 Rails/CreateTableWithTimestamps:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 

+Rails/FindBy:
+  IgnoreWhereFirst: false
+

 Rails/FindEach:
   Enabled: false
 
 Rails/FindEach:
   Enabled: false