Merge pull request #801 from chef/1.4.2

Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Nov 27, 2020 · 8877953 · 8877953
2 parents 2c4fe70 + 28a9871
commit 8877953
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/config/cookstyle.yml b/config/cookstyle.yml
@@ -2096,6 +2096,7 @@ Style/EmptyElse:
   Enabled: true
 Layout/EmptyLineBetweenDefs:
   Enabled: true
+  AllowAdjacentOneLineDefs: true
 Layout/EmptyLines:
   Enabled: true
 Layout/EmptyLinesAroundAccessModifier:

diff --git a/config/upstream.yml b/config/upstream.yml
@@ -459,7 +459,7 @@ Layout/EmptyLineAfterMultilineCondition:
     - https://github.com/airbnb/ruby#multiline-if-newline
 
 Layout/EmptyLineBetweenDefs:
-  Description: 'Use empty lines between defs.'
+  Description: 'Use empty lines between class/module/method defs.'
   StyleGuide: '#empty-lines-between-methods'
   Enabled: true
   VersionAdded: '0.49'
@@ -2456,7 +2456,7 @@ Naming/VariableNumber:
   StyleGuide: '#snake-case-symbols-methods-vars-with-numbers'
   Enabled: true
   VersionAdded: '0.50'
-  VersionChanged: '1.3'
+  VersionChanged: '1.4'
   EnforcedStyle: normalcase
   SupportedStyles:
     - snake_case

diff --git a/lib/cookstyle/version.rb b/lib/cookstyle/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
   VERSION = "7.3.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.4.1'
+  RUBOCOP_VERSION = '1.4.2'
 end