Merge pull request #295 from cwoodcox/upgrade-heroku

Upgrade Heroku dependency

Gemfile

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

Gemfile.lock

@@ -128,10 +128,11 @@ GEM
     growl-glue (1.0.7)
     haml (3.1.2)
     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)
     httparty (0.7.8)
       crack (= 0.1.8)
@@ -307,7 +308,7 @@ DEPENDENCIES
   formtastic (~> 1.2.3)
   growl-glue
   haml (= 3.1.2)
-  heroku (= 1.19.1)
+  heroku (= 2.19.1)
   highline
   httparty (= 0.7.8)
   inherited_resources (~> 1.1.2)

locomotive_cms.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'json_pure', '1.5.1'
   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 'carrierwave', '0.5.6'