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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index f8060f9484cc72939fd84e9ac2f94a98804468b4..60d14454437c10c9b2e5f46fe609d619e8c6a44f 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,7 +9,7 @@ require:
   - rubocop-rake
 
 AllCops:
   - rubocop-rake
 
 AllCops:

-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1

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


@@ -17,11 +17,6 @@ AllCops:
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true
 

-# Config can be removed after https://github.com/rubocop/rubocop-factory_bot/issues/53
-FactoryBot/AssociationStyle:
-  Include:
-    - 'test/factories/**/*'
-

 Layout/ExtraSpacing:
   AllowForAlignment: true
 
 Layout/ExtraSpacing:
   AllowForAlignment: true
 


@@ -50,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
 


@@ -68,7 +70,7 @@ Rails/ReflectionClassName:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'

-    - 'app/controllers/users_controller.rb'
+    - 'app/controllers/users/lists_controller.rb'

 
 Style/Documentation:
   Enabled: false
 
 Style/Documentation:
   Enabled: false