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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index e99b88edc170bda2a77db1f824a8bb4ab55ee533..24d57fb37cc0b354c71674e00c8a6f9671bbdf6b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,21 +3,50 @@ inherit_from: .rubocop_todo.yml
 Rails:
   Enabled: true
 
-Performance/RedundantMerge:
-  Enabled: false
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   AllowForAlignment: true
 
-Style/FileName:
+Lint/PercentStringArray:
+  Exclude:
+    - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/site_controller.rb'
+
+Naming/FileName:
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+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'
+    - 'app/controllers/user_controller.rb'
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/FormatStringToken:
+  EnforcedStyle: template
+
 Style/IfInsideElse:
   Enabled: false
 
@@ -34,9 +63,13 @@ Style/HashSyntax:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/WordArray:
-  Exclude:
-    - 'test/models/message_test.rb'
+Style/SymbolArray:
+  EnforcedStyle: brackets