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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e18afd83581ba0fc47d728032b3ade65f091b1a..ddfb63cae0610942a1ac6f107267e2c283ea2b50 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -68,6 +68,9 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 

+Style/ArgumentsForwarding:
+  Enabled: false
+

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