github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #295 from cwoodcox/upgrade-heroku 

Upgrade Heroku dependency
This commit is contained in:
Mario Visic 2012-03-03 07:32:46 -08:00
parent 6d3dd1d91e 635af37be5
commit e3e9909268
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -33,7 +33,7 @@ gem 'cancan'
gem 'fog', '0.8.2' gem 'fog', '0.8.2'
gem 'mimetype-fu' gem 'mimetype-fu'
gem 'actionmailer-with-request', :require => 'actionmailer_with_request' gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
gem 'heroku', '1.19.1' gem 'heroku', '2.19.1'
gem 'httparty', '0.7.8' gem 'httparty', '0.7.8'
gem 'RedCloth', '4.2.9' gem 'RedCloth', '4.2.9'
gem 'delayed_job_mongoid', '1.0.8' gem 'delayed_job_mongoid', '1.0.8'

11
Gemfile.lock
View File

@ -128,10 +128,11 @@ GEM
growl-glue (1.0.7) growl-glue (1.0.7)
haml (3.1.2) haml (3.1.2)
has_scope (0.5.1) has_scope (0.5.1)
heroku (1.19.1) heroku (2.19.1)
activesupport (>= 2.1.0) launchy (>= 0.3.2)
launchy (~> 0.3.2) rest-client (~> 1.6.1)
rest-client (>= 1.4.0, < 1.7.0) rubyzip
term-ansicolor (~> 1.0.5)
highline (1.6.9) highline (1.6.9)
httparty (0.7.8) httparty (0.7.8)
crack (= 0.1.8) crack (= 0.1.8)
@ -307,7 +308,7 @@ DEPENDENCIES
formtastic (~> 1.2.3) formtastic (~> 1.2.3)
growl-glue growl-glue
haml (= 3.1.2) haml (= 3.1.2)
heroku (= 1.19.1) heroku (= 2.19.1)
highline highline
httparty (= 0.7.8) httparty (= 0.7.8)
inherited_resources (~> 1.1.2) inherited_resources (~> 1.1.2)

2
locomotive_cms.gemspec
View File

@ -41,7 +41,7 @@ Gem::Specification.new do |s|
s.add_dependency 'json_pure', '1.5.1' s.add_dependency 'json_pure', '1.5.1'
s.add_dependency 'bushido' s.add_dependency 'bushido'
s.add_dependency 'heroku', '1.19.1' s.add_dependency 'heroku', '2.19.1'
s.add_dependency 'rmagick', '2.12.2' s.add_dependency 'rmagick', '2.12.2'
s.add_dependency 'carrierwave', '0.5.6' s.add_dependency 'carrierwave', '0.5.6'