summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-04-27 14:20:12 -0500
committerGitHub <noreply@github.com>2017-04-27 14:20:12 -0500
commit059fbdd0ea44cb85dd47065c48c9a87933e45bb8 (patch)
tree4d8693550cd4cfd670b3b6dbd86e3c3af36a0da0
parent919b096e9da79bc11ed2b9508623c3562c50ce1b (diff)
parent3979afc01bef7d05cc32912e1909f4ca9ec84e41 (diff)
downloadchef-059fbdd0ea44cb85dd47065c48c9a87933e45bb8.tar.gz
Merge pull request #6096 from chef/lcg/remove-bundler-again
actually i don't think appveyor needs this
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock5
2 files changed, 2 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 1097635fd6..560f5c5cfa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,9 +50,6 @@ group(:linux, :bsd, :mac_os_x, :solaris) do
gem "ruby-shadow", platforms: :ruby
end
-# appveyor seems to need this here?
-gem "bundler"
-
group(:development, :test) do
gem "rake"
gem "simplecov"
diff --git a/Gemfile.lock b/Gemfile.lock
index b75b95e3e5..6aad38e3db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
appbundler (0.10.0)
mixlib-cli (~> 1.4)
ast (2.3.0)
- backports (3.7.0)
+ backports (3.8.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
@@ -286,7 +286,7 @@ GEM
rake
rake (12.0.0)
rb-readline (0.5.4)
- retriable (3.0.1)
+ retriable (3.0.2)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
@@ -413,7 +413,6 @@ PLATFORMS
DEPENDENCIES
appbundler
- bundler
bundler-audit!
chef!
chef-config!