Merge pull request #118 from chef/1.5.2

Signed-off-by: Tim Smith <tsmith@chef.io>
chef · Dec 4, 2020 · ba6f4d1 · ba6f4d1
2 parents 42db6d2 + 265b364
commit ba6f4d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,4 @@ end
 group :development do
   gem "rake", ">= 12.0"
   gem "rspec", ">= 3.4"
-end
-
-# pin until we drop ruby 2.4 and then remove this entirely
-gem "parallel", "< 1.20"
+end
diff --git a/Rakefile b/Rakefile
@@ -17,7 +17,7 @@ task :vendor do
   File.open(dst.join("disable_all.yml"), "w") { |fh| fh.write YAML.dump(cfg) }
 
   sh %{git add #{dst}/{upstream,disable_all}.yml}
-  sh %{git commit -m "Vendor rubocop-#{upstream.version} upstream configuration."}
+  sh %{git commit -m "Vendor rubocop-#{upstream.version} upstream configuration." -m "Obvious fix; these changes are the result of automation not creative thinking."}
 end
 
 require "chefstyle"

diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Chefstyle
   VERSION = "1.5.6"
-  RUBOCOP_VERSION = "1.5.0"
+  RUBOCOP_VERSION = "1.5.2"
 end