diff --git a/Gemfile b/Gemfile index 4545c6f300fb9cd2e60ea33234590c8c1a93d82d..fd62809bae6fc7ee9c8990c39c9c0baa6ecd1a3c 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'foreigner', '1.4.2' # File uploading gem 'carrierwave', '0.9.0' -gem 'fog', '1.12.1' +gem 'fog', '1.14.0' gem 'mini_magick', '3.6.0' gem 'remotipart', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index cdada42fd40b33e02c0c16677349e07f1f40c79d..6644b86f97fb149ff75f89e1680f89cc820f1042 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM ethon (0.5.12) ffi (>= 1.3.0) mime-types (~> 1.18) - excon (0.23.0) + excon (0.25.3) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -117,15 +117,15 @@ GEM fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.12.1) + fog (1.14.0) builder - excon (~> 0.23.0) + excon (~> 0.25.0) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) - nokogiri (~> 1.5.0) + nokogiri (~> 1.5) ruby-hmac font-awesome-rails (3.2.1.2) railties (>= 3.2, < 5.0) @@ -433,7 +433,7 @@ DEPENDENCIES faraday (= 0.8.8) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.6) - fog (= 1.12.1) + fog (= 1.14.0) foreigner (= 1.4.2) foreman (= 0.62) fuubar (= 1.1.1)