Merge pull request #4218 from AntonKhorev/no-user-id-renames

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 97bb72e0ac03fee0bc94c89280bdb14d400f4ee1..ddfb63cae0610942a1ac6f107267e2c283ea2b50 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,9 +37,6 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Max: 150
 
-Minitest/MultipleAssertions:
-  Enabled: false
-
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
@@ -71,6 +68,9 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false