From 50dcbe92e0434193e1282dca52e399c21289590e Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Fri, 3 Jan 2014 14:49:25 +0100
Subject: [PATCH] force travis to use recent bundler to support ruby 2.1

---
 .travis.yml  | 6 +++++-
 Gemfile.lock | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c01776a1..5eeee3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
 language: ruby
+
 rvm:
  - 1.9.3
  - 2.0.0
  - 2.1
 
+bundler_args: --without development
+
 before_install:
+before_install: 
+  - "gem install bundler -v=1.5.1"
   - "mysql -e 'create database tracks_test;'"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -13,7 +18,6 @@ before_install:
 
 script: "CODECLIMATE_REPO_TOKEN=5c52fdd2bbcd0734d56ddb2c3cbaac782da345273e8689d25f54a065ccc3397c bundle exec rake ci RACK_ENV=test"
 
-bundler_args: --without development
 notifications:
   email: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 810cae58..23f3476c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.8.2)
-    multi_test (0.0.2)
+    multi_test (0.0.3)
     mysql2 (0.3.14)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)