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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 55be8141cf31c53115cecdcbe08ffd8d266b9089..5e7be9797e8ebdef5de86cb4a3ff65acdf264cee 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -41,12 +41,18 @@ Naming/FileName:
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/CreateTableWithTimestamps:
+  Enabled: false
+
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 
+Rails/InverseOf:
+  Enabled: false
+
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'