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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index dc2a33a35b05d863e828a7afd5649ec8461534b4..97bb72e0ac03fee0bc94c89280bdb14d400f4ee1 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,6 +37,9 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Max: 150
 
+Minitest/MultipleAssertions:
+  Enabled: false
+
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
@@ -48,6 +51,9 @@ Naming/MethodParameterName:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/FindBy:
+  IgnoreWhereFirst: false
+
 Rails/FindEach:
   Enabled: false