diff options
| author | Julian C. Dunn <jdunn@aquezada.com> | 2014-11-24 15:31:48 -0500 |
|---|---|---|
| committer | Julian C. Dunn <jdunn@aquezada.com> | 2014-11-24 15:31:48 -0500 |
| commit | 90ac5191358550e5521b2ecb8df027cde6a5e44a (patch) | |
| tree | 62bd3001bab7777e61140f9c1a6797a7433fe707 | |
| parent | 8c4e32c4e8ac22394222c718e61b13e3d5ec2ad3 (diff) | |
| parent | 043613e6dcac669a930e5fd0c2e2ae0a3c91bcd6 (diff) | |
| download | chef-90ac5191358550e5521b2ecb8df027cde6a5e44a.tar.gz | |
Merge pull request #2445 from juliandunn/remove-travis-187-workaround
Revert rubygems 2.2.0 with bundler 1.5 with Ruby 1.8.7 fix
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index b2b002d8b7..2ce7238619 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,6 @@ -# Temporary workaround for issue with rubygems 2.2.0 with bundler 1.5 on ruby -# 1.8.7. -# -# A fix has been merged to rubygems but not yet released. See: -# https://github.com/rubygems/rubygems/commit/f8e0f1d5f67cfc4e1966cc1e2db367aebf8a09e4 -# -# See also CHEF-4916 -# -# This workaround should be removed when that fix is released. +# Early warning system to catch if Rubygems breaks something before_install: -- gem update --system 2.1.11 -- gem --version + gem update --system branches: only: |