From f4d996d644396af4526ac0dafb639bc74ccbbbb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 13 May 2012 17:03:23 +0200
Subject: [PATCH] do not break non heroku setups/do not confront them with a
 useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in
 the Gemfile

---
 Gemfile      | 4 ++--
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index db5c45518..d4bcf4e4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-ruby '1.9.3'
+gem 'bundler', '> 1.1.0'
+ruby '1.9.3' if ENV['HEROKU']
 
 gem 'rails', '3.1.4'
 gem 'rails_autolink'
-gem 'bundler', '~> 1.1.0'
 gem 'foreman', '0.41'
 gem 'whenever'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 152f632f5..98f4cce8a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -503,7 +503,7 @@ DEPENDENCIES
   airbrake
   asset_sync
   bootstrap-sass (~> 2.0.2)
-  bundler (~> 1.1.0)
+  bundler (> 1.1.0)
   capistrano
   capistrano-ext
   capistrano_colors