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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 62685c8ed9298696a03a7f920037b4b36ff6f02b..b33f9046cb87c117925cc8e290392f2021aae270 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,26 +1,60 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

+AllCops:
+  TargetRubyVersion: 2.3
+

 Rails:
   Enabled: true
 
 Rails:
   Enabled: true
 

-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
-Style/ExtraSpacing:
+Layout/ExtraSpacing:

   AllowForAlignment: true
 
   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'
 
   Exclude:
     - 'script/deliver-message'
     - 'script/locale/reload-languages'
     - 'script/update-spam-blocks'
 

-Style/IfInsideElse:
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/CreateTableWithTimestamps:
+  Enabled: false
+
+Rails/FindEach:
+  Enabled: false
+
+Rails/HasManyOrHasOneDependent:

   Enabled: false
 
   Enabled: false
 

-Style/GlobalVars:
+Rails/HttpPositionalArguments:
+  Enabled: false
+
+Rails/InverseOf:
+  Enabled: false
+
+Rails/SkipsModelValidations:

   Exclude:
   Exclude:

-    - 'lib/quad_tile/extconf.rb'
+    - 'db/migrate/*.rb'
+    - 'app/controllers/users_controller.rb'
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/FormatStringToken:
+  EnforcedStyle: template
+
+Style/IfInsideElse:
+  Enabled: false

 
 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false


@@ -31,9 +65,13 @@ Style/HashSyntax:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 

+Style/MixinUsage:
+  Exclude:
+    - 'bin/setup'
+    - 'bin/update'
+

 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

-Style/WordArray:
-  Exclude:
-    - 'test/models/message_test.rb'
+Style/SymbolArray:
+  EnforcedStyle: brackets