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

[chef.git] / .rubocop.yml

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