summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-03-09 11:32:06 -0700
committerGitHub <noreply@github.com>2020-03-09 11:32:06 -0700
commit5610138134c9b2606ab13b04d63c03bec6c6c3c4 (patch)
tree61437a3f588a6254acd2bfe52b564631443bc271
parent2ece34c7e2caaa3d22e142bd89ca9fc5e9eb4e6d (diff)
parentdc48981a8c8997456ca722773bdfa684c43a6d47 (diff)
downloadchef-5610138134c9b2606ab13b04d63c03bec6c6c3c4.tar.gz
Merge pull request #9464 from chef/rake
Pin to Rake 13.0.1 to prevent double rake
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 1d99d59198..7a9faae768 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,7 @@ group(:development, :test) do
# we pin rake as a copy of rake is installed from the ruby source
# if you bump the ruby version you should confirm we don't end up with
# two rake gems installed again
- gem "rake", "<= 12.3.2"
+ gem "rake", "<= 13.0.1"
gem "rspec-core", "~> 3.5"
gem "rspec-mocks", "~> 3.5"
diff --git a/Gemfile.lock b/Gemfile.lock
index d0aa2b1dbf..cde9ca0503 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
public_suffix (4.0.3)
rack (2.2.2)
rainbow (3.0.0)
- rake (12.3.2)
+ rake (13.0.1)
rb-readline (0.5.5)
regexp_parser (1.7.0)
rexml (3.2.4)
@@ -476,7 +476,7 @@ DEPENDENCIES
pry-byebug
pry-remote
pry-stack_explorer
- rake (<= 12.3.2)
+ rake (<= 13.0.1)
rb-readline
rspec-core (~> 3.5)
rspec-expectations (~> 3.5)