diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-29 17:19:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 17:19:07 -0700 |
| commit | de638940366eb4862e58928073255607c9f1d1c5 (patch) | |
| tree | 21286955657207c913fcc6118f2720a589318d0a | |
| parent | 4adf8e07a370adbf928402bbab51c1a5f65819f7 (diff) | |
| parent | fdf1e824262b5bb9c2025cf7791a0290d137f379 (diff) | |
| download | chef-de638940366eb4862e58928073255607c9f1d1c5.tar.gz | |
Merge pull request #7812 from chef/rake_pin
Pin rake to 12.0 to prevent shipping 2 copies
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -52,7 +52,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.0" + gem "rake", "<= 12.0.0" gem "simplecov" gem "webmock" gem "chefstyle", "0.6.0" diff --git a/Gemfile.lock b/Gemfile.lock index c9e59d240c..260e9dca43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM rack (2.0.5) rainbow (2.2.2) rake - rake (12.3.0) + rake (12.0.0) rb-readline (0.5.5) rspec (3.7.0) rspec-core (~> 3.7.0) @@ -392,7 +392,7 @@ DEPENDENCIES pry-byebug pry-remote pry-stack_explorer - rake (<= 12.3.0) + rake (<= 12.0.0) rb-readline ruby-prof ruby-shadow @@ -403,4 +403,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.17.1 + 1.16.6 |