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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index f8060f9484cc72939fd84e9ac2f94a98804468b4..ddfb63cae0610942a1ac6f107267e2c283ea2b50 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
 
@@ -53,6 +48,9 @@ Naming/MethodParameterName:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/FindBy:
+  IgnoreWhereFirst: false
+
 Rails/FindEach:
   Enabled: false
 
@@ -70,6 +68,9 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false