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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index ddfb63cae0610942a1ac6f107267e2c283ea2b50..c0f0c1fa08053ec082a77ae9cd8e6e3d0facb874 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -45,6 +45,10 @@ Naming/FileName:
 Naming/MethodParameterName:
   Enabled: false
 
+# This conflicts with Strong Migrations, which can't check `change_table`
+Rails/BulkChangeTable:
+  Enabled: false
+
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
@@ -68,9 +72,6 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
-Style/ArgumentsForwarding:
-  Enabled: false
-
 Style/Documentation:
   Enabled: false