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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 87abac9a3becdd243a02b10ef612b2781d0a8004..9b7a28d87e0ad61061f9411371c9f1c3df848902 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,11 +1,15 @@
 inherit_from: .rubocop_todo.yml
 
 require:
 inherit_from: .rubocop_todo.yml
 
 require:

+  - rubocop-minitest

   - rubocop-performance
   - rubocop-rails
 
 AllCops:
   TargetRubyVersion: 2.5
   - rubocop-performance
   - rubocop-rails
 
 AllCops:
   TargetRubyVersion: 2.5

+  NewCops: enable
+  Exclude:
+    - 'vendor/**/*'

 
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true


@@ -27,16 +31,15 @@ Metrics/ClassLength:
   Exclude:
     - 'test/**/*'
 
   Exclude:
     - 'test/**/*'
 

+Metrics/ModuleLength:
+  Max: 150
+

 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'

-    - 'script/locale/reload-languages'

     - 'script/update-spam-blocks'
 
     - 'script/update-spam-blocks'
 

-Naming/UncommunicativeMethodParamName:
-  Enabled: false
-
-Rails/ApplicationRecord:
+Naming/MethodParameterName:

   Enabled: false
 
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
 Rails/CreateTableWithTimestamps:


@@ -59,11 +62,12 @@ Rails/SkipsModelValidations:
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 
     - 'db/migrate/*.rb'
     - 'app/controllers/users_controller.rb'
 

-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
+Style/Documentation:
+  Enabled: false

 
 Style/FormatStringToken:
 
 Style/FormatStringToken:

-  EnforcedStyle: template
+  Exclude:
+    - 'config/routes.rb'

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


@@ -71,12 +75,21 @@ Style/IfInsideElse:
 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false
 

+Style/HashEachMethods:
+  Enabled: true
+

 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
     - 'lib/tasks/testing.rake'
     - 'config/initializers/wrap_parameters.rb'
 

+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+

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