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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index dce00b925c73bc246936644f51b653a3f9fc8bdc..55be8141cf31c53115cecdcbe08ffd8d266b9089 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,18 +1,73 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
+AllCops:
+  Include:
+    - '**/*.gemspec'
+    - '**/*.podspec'
+    - '**/*.jbuilder'
+    - '**/*.rake'
+    - '**/*.opal'
+    - '**/config.ru'
+    - '**/Gemfile'
+    - '**/Rakefile'
+    - '**/Capfile'
+    - '**/Guardfile'
+    - '**/Podfile'
+    - '**/Thorfile'
+    - '**/Vagrantfile'
+    - '**/Berksfile'
+    - '**/Cheffile'
+    - '**/Vagabondfile'
+    - '**/Fastfile'
+    - '**/*.builder'
+
+Rails:
+  Enabled: true
+
+Layout/ExtraSpacing:
+  AllowForAlignment: true
+
+Lint/PercentStringArray:
+  Exclude:
+    - 'config/initializers/secure_headers.rb'
+    - 'app/controllers/site_controller.rb'

 
 

-Style/FileName:
+Naming/FileName:

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

+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/HasManyOrHasOneDependent:
+  Enabled: false
+
+Rails/HttpPositionalArguments:
+  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
+

 Style/GlobalVars:
   Exclude:
     - 'lib/quad_tile/extconf.rb'
 Style/GlobalVars:
   Exclude:
     - 'lib/quad_tile/extconf.rb'

-    
+
+Style/GuardClause:
+  Enabled: false
+

 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:


@@ -21,3 +76,6 @@ Style/HashSyntax:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

+
+Style/SymbolArray:
+  EnforcedStyle: brackets