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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index f8060f9484cc72939fd84e9ac2f94a98804468b4..c0f0c1fa08053ec082a77ae9cd8e6e3d0facb874 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -17,11 +17,6 @@ AllCops:
 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
 
@@ -50,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