Merge branch 'master' into moderation

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 477b2ab02c152e3af3488a62eb8c0b79040d1db3..e1f1724e0f995623182ed9025b71b5dbdfd65bf5 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,18 +24,21 @@ AllCops:
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true
 

+Layout/ExtraSpacing:
+  AllowForAlignment: true
+

 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 

-Style/ExtraSpacing:
-  AllowForAlignment: true
-

 Style/FileName:
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 
 Style/FileName:
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 

+Style/FormatStringToken:
+  EnforcedStyle: template
+

 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false
 


@@ -55,6 +58,12 @@ Style/HashSyntax:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+Rails/ApplicationRecord:
+  Enabled: false
+

 Rails/HttpPositionalArguments:
   Enabled: false
 
 Rails/HttpPositionalArguments:
   Enabled: false
 


@@ -62,3 +71,8 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*.rb'
     - 'app/controllers/user_controller.rb'
   Exclude:
     - 'db/migrate/*.rb'
     - 'app/controllers/user_controller.rb'

+
+Lint/PercentStringArray:
+  Exclude:
+    - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/site_controller.rb'