diff --git a/Gemfile b/Gemfile index 2fd85953c..83a226703 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'foreigner', '1.4.0' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.9.0' +gem 'fog', '1.10.0' gem 'mini_magick', '3.5' gem 'remotipart', '1.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index 38f9b9800..64abd1561 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,13 +116,13 @@ GEM fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.9.0) + fog (1.10.0) builder excon (~> 0.14) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) - net-scp (~> 1.0.4) + net-scp (~> 1.1) net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac @@ -218,11 +218,11 @@ GEM multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.1) - net-scp (1.0.4) - net-ssh (>= 1.99.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) net-sftp (2.0.5) net-ssh (>= 2.0.9) - net-ssh (2.6.3) + net-ssh (2.6.6) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) nokogiri (1.5.6) @@ -433,7 +433,7 @@ DEPENDENCIES faraday (= 0.8.6) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) - fog (= 1.9.0) + fog (= 1.10.0) foreigner (= 1.4.0) foreman (= 0.61) fuubar (= 1.1.0)