From 5a34ef859204e94dc3fc093f4f0c5b6da60f4e91 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Fri, 9 Mar 2012 18:33:47 -0800
Subject: [PATCH] update travis.yml for bundler 1.1

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

diff --git a/.travis.yml b/.travis.yml
index ac3179ac7..b7feaff2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,10 @@ env:
   - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
-before_install: "./script/ci/before_install.sh"
+before_install: 
+  - gem install bundler
+  - "./script/ci/before_install.sh"
+
 bundler_args: "--without development production heroku"
 before_script: "./script/ci/before.sh"
 script: "bundle exec rake travis"
diff --git a/Gemfile b/Gemfile
index 77f3baa43..e7f29b3fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.11'
 
-gem 'bundler', '>= 1.1.rc.8'
+gem 'bundler', '>= 1.1.0'
 gem 'foreman', '0.34.1'
 gem 'whenever'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 57eca8e8b..1faad6b79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -447,7 +447,7 @@ DEPENDENCIES
   acts_as_api
   addressable (= 2.2.4)
   airbrake
-  bundler (>= 1.1.rc.8)
+  bundler (>= 1.1.0)
   capistrano (~> 2.9.0)
   capistrano-ext (= 1.2.1)
   capistrano_colors
-- 
GitLab