aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile.lock3
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