diff --git a/Gemfile b/Gemfile index 49598ef63..0dd8b5cf3 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'foreigner', '1.4.1' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.10.1' +gem 'fog', '1.12.1' gem 'mini_magick', '3.5' gem 'remotipart', '1.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index 7fefb9fc9..ab21a3fcc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM ethon (0.5.12) ffi (>= 1.3.0) mime-types (~> 1.18) - excon (0.20.1) + excon (0.23.0) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -115,9 +115,9 @@ GEM fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.10.1) + fog (1.12.1) builder - excon (~> 0.20) + excon (~> 0.23.0) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) @@ -215,7 +215,7 @@ GEM multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.2) - net-scp (1.1.0) + net-scp (1.1.1) net-ssh (>= 2.6.5) net-ssh (2.6.7) nokogiri (1.5.9) @@ -426,7 +426,7 @@ DEPENDENCIES faraday (= 0.8.7) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) - fog (= 1.10.1) + fog (= 1.12.1) foreigner (= 1.4.1) foreman (= 0.62) fuubar (= 1.1.0)