Merge pull request #4405 from tomhughes/normalize-display-name

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index dc2a33a35b05d863e828a7afd5649ec8461534b4..ddfb63cae0610942a1ac6f107267e2c283ea2b50 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -48,6 +48,9 @@ Naming/MethodParameterName:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/FindBy:
+  IgnoreWhereFirst: false
+
 Rails/FindEach:
   Enabled: false
 
@@ -65,6 +68,9 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false