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

2012-05-13 17:03:23 +02:00 · 2012-05-13 17:03:23 +02:00 · f4d996d644
commit f4d996d644
parent bcadedc258
2 changed files with 3 additions and 3 deletions
--- a/4
+++ b/4
@ -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'

--- 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