diff options
| author | Bryan McLellan <btm@opscode.com> | 2013-07-26 11:57:14 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2013-07-26 11:57:14 -0700 |
| commit | 70add0f90239ab45c76a7bf1cb02a9c2245d3122 (patch) | |
| tree | 8c7c274f20e9031bfa5f0d8862e3c93a0d863731 | |
| parent | 444ac9ce281af7db6b4e0a3912bdb71c10cced5e (diff) | |
| parent | d3629feaa30da9a83c528c935a3997a4f92a5aa8 (diff) | |
| download | chef-70add0f90239ab45c76a7bf1cb02a9c2245d3122.tar.gz | |
Merge branch 'CHEF-4342' into 10-stable
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | chef-expander/Gemfile | 2 | ||||
| -rw-r--r-- | chef-server-api/Gemfile | 2 | ||||
| -rw-r--r-- | chef-server-webui/Gemfile | 2 | ||||
| -rw-r--r-- | chef/Gemfile | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f0214822f3..677f3e1e5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,7 @@ -before_script: cd chef before_install: sudo apt-get install -qq libgecode-dev -gemfile: chef/Gemfile - rvm: - 1.8.7 - 1.9.3 - 2.0.0 - -script: bundle exec rake spec +gemfile: chef/Gemfile +script: (cd chef && bundle exec rspec --format progress) diff --git a/chef-expander/Gemfile b/chef-expander/Gemfile index 1eb1987930..d95dc26a97 100644 --- a/chef-expander/Gemfile +++ b/chef-expander/Gemfile @@ -1,4 +1,4 @@ ## Chef Expander ## -source :rubygems +source 'https://rubygems.org' gemspec diff --git a/chef-server-api/Gemfile b/chef-server-api/Gemfile index 6cc84178c2..405f722f07 100644 --- a/chef-server-api/Gemfile +++ b/chef-server-api/Gemfile @@ -1,7 +1,7 @@ $:.push File.expand_path("../lib", __FILE__) require "chef-server-api/version" -source :rubygems +source 'https://rubygems.org' gem 'bunny' gem 'uuidtools' diff --git a/chef-server-webui/Gemfile b/chef-server-webui/Gemfile index 0bce1e9ff4..8a8740ce7f 100644 --- a/chef-server-webui/Gemfile +++ b/chef-server-webui/Gemfile @@ -1,7 +1,7 @@ $:.push File.expand_path("../lib", __FILE__) require "chef-server-webui/version" -source :rubygems +source 'https://rubygems.org' gem "haml" gem "ruby-openid" diff --git a/chef/Gemfile b/chef/Gemfile index 192d10ca0e..dbf5204946 100644 --- a/chef/Gemfile +++ b/chef/Gemfile @@ -1,4 +1,4 @@ -source :rubygems +source 'https://rubygems.org' gemspec |