From a6872b60efa0f55827bf7467d4a4bfa20c0872f1 Mon Sep 17 00:00:00 2001 From: Keith Pitt Date: Fri, 4 Feb 2011 16:26:52 +0800 Subject: [PATCH] Upgrade fog --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ locomotive_cms.gemspec | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 82b6d717..283b39c8 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'rmagick', '= 2.12.2' gem 'locomotive_carrierwave', '0.5.0.1.beta2', :require => 'carrierwave' gem 'custom_fields', '1.0.0.beta2' -gem 'fog', '0.2.30' +gem 'fog', '0.3.7' gem 'mimetype-fu' gem 'actionmailer-with-request' gem 'heroku' diff --git a/Gemfile.lock b/Gemfile.lock index 935437ac..6bd5072f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,14 +102,14 @@ GEM railties (>= 3.0.0) ffi (0.6.3) rake (>= 0.8.7) - fog (0.2.30) + fog (0.3.7) builder - excon (>= 0.2.0) + excon (>= 0.2.3) formatador (>= 0.0.15) json mime-types - net-ssh - nokogiri (>= 1.4.3.1) + net-ssh (~> 2.0.23) + nokogiri (~> 1.4.3.1) ruby-hmac formatador (0.0.16) formtastic (1.2.3) @@ -168,7 +168,7 @@ GEM mongo (= 1.0.9) tzinfo (~> 0.3.22) will_paginate (~> 3.0.pre) - net-ssh (2.1.0) + net-ssh (2.0.24) nokogiri (1.4.3.1) pickle (0.4.4) cucumber (>= 0.8) @@ -273,7 +273,7 @@ DEPENDENCIES delayed_job_mongoid! devise (= 1.1.3) factory_girl_rails - fog (= 0.2.30) + fog (= 0.3.7) formtastic (>= 1.1.0) growl-glue haml (= 3.0.18) diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index cec1dc59..5aa22579 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |s| s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta2" s.add_dependency "custom_fields", "1.0.0.beta2" - s.add_dependency "fog", '0.2.30' + s.add_dependency "fog", '0.3.7' s.add_dependency "mimetype-fu" s.add_dependency "actionmailer-with-request" s.add_dependency "heroku"