diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-29 10:41:21 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-29 10:41:21 -0300 |
| commit | f5559111b55d99a2862b83eed6f2882b2f59bbd9 (patch) | |
| tree | a14ffa9ca980d5e8f8784ca5daaafa80c230cc4b | |
| parent | d9695a669b787a3ad1ddb464cb1d0795a67f213f (diff) | |
| parent | 783637eb2031f7fe70525c2ded0bad7264c10a6c (diff) | |
| download | rails-f5559111b55d99a2862b83eed6f2882b2f59bbd9.tar.gz rails-f5559111b55d99a2862b83eed6f2882b2f59bbd9.tar.bz2 rails-f5559111b55d99a2862b83eed6f2882b2f59bbd9.zip | |
Merge pull request #20355 from segiddins/seg-bundler-1-10
Bundler 1.10 should work now!
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9d8632f9b0..6c870d8797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ language: ruby sudo: false script: 'ci/travis.rb' before_install: - - gem uninstall bundler -x --force - - gem install bundler --version "< 1.10" + - gem install bundler - "rm ${BUNDLE_GEMFILE}.lock" before_script: - bundle update diff --git a/Gemfile.lock b/Gemfile.lock index 5adbf65045..6c900835cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -306,3 +306,6 @@ DEPENDENCIES turbolinks uglifier (>= 1.3.0) w3c_validators + +BUNDLED WITH + 1.10.1 |