From 76f0cdbd90d23fe35ca2822cec25409f4ca8fc72 Mon Sep 17 00:00:00 2001
From: "Samuel E. Giddins" <segiddins@segiddins.me>
Date: Thu, 28 May 2015 22:38:19 -0700
Subject: Revert "Force the uninstall"

This reverts commit 9ff901bd3e046b0373b28459269146707b5bf8c9.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d8632f9b0..056181384a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 sudo: false
 script: 'ci/travis.rb'
 before_install:
-  - gem uninstall bundler -x --force
+  - gem uninstall bundler
   - gem install bundler --version "< 1.10"
   - "rm ${BUNDLE_GEMFILE}.lock"
 before_script:
-- 
cgit v1.2.3


From 950b06b2c6f60a11d8e50c3c4d4274432129af82 Mon Sep 17 00:00:00 2001
From: "Samuel E. Giddins" <segiddins@segiddins.me>
Date: Thu, 28 May 2015 22:38:30 -0700
Subject: Revert "Uninstall bundler 1.10"

This reverts commit 410d246bc0ddabe47f0bf54116be9087bd3d4bda.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 056181384a..96dc22d275 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: ruby
 sudo: false
 script: 'ci/travis.rb'
 before_install:
-  - gem uninstall bundler
   - gem install bundler --version "< 1.10"
   - "rm ${BUNDLE_GEMFILE}.lock"
 before_script:
-- 
cgit v1.2.3


From be50118916683d999ac38cc1b34d7cf40388d7a9 Mon Sep 17 00:00:00 2001
From: "Samuel E. Giddins" <segiddins@segiddins.me>
Date: Thu, 28 May 2015 22:38:50 -0700
Subject: Revert "Use bundler < 1.10 until its bugs are fixed"

This reverts commit 81b42970f02d07ca5007bbce920b489d80172636.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 96dc22d275..6c870d8797 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 sudo: false
 script: 'ci/travis.rb'
 before_install:
-  - gem install bundler --version "< 1.10"
+  - gem install bundler
   - "rm ${BUNDLE_GEMFILE}.lock"
 before_script:
   - bundle update
-- 
cgit v1.2.3


From 783637eb2031f7fe70525c2ded0bad7264c10a6c Mon Sep 17 00:00:00 2001
From: "Samuel E. Giddins" <segiddins@segiddins.me>
Date: Thu, 28 May 2015 22:40:29 -0700
Subject: Generate Bundler 1.10.1 lockfile

---
 Gemfile.lock | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3