Merge remote-tracking branch 'github/pull/339'

[chef.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 5db1a31045524667dabbea1a6aaf55863ffa3ed4..649fc64dc4e1ab442d295463e9eae0b87bcff42b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,15 +1,18 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
+
+ChefModernize/IncludingAptDefaultRecipe:
+  Enabled: false
 
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
-Layout/IndentHeredoc:
-  EnforcedStyle: squiggly
+Layout/HeredocIndentation:
+  Enabled: true
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 Style/HashSyntax: