nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jonne Haß 2012-05-13 17:03:23 +02:00
parent bcadedc258
commit f4d996d644
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -1,10 +1,10 @@
source 'http://rubygems.org' 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', '3.1.4'
gem 'rails_autolink' gem 'rails_autolink'
gem 'bundler', '~> 1.1.0'
gem 'foreman', '0.41' gem 'foreman', '0.41'
gem 'whenever' gem 'whenever'

2
Gemfile.lock
View file

@ -503,7 +503,7 @@ DEPENDENCIES
airbrake airbrake
asset_sync asset_sync
bootstrap-sass (~> 2.0.2) bootstrap-sass (~> 2.0.2)
bundler (~> 1.1.0) bundler (> 1.1.0)
capistrano capistrano
capistrano-ext capistrano-ext
capistrano_colors capistrano_colors