diff --git a/Gemfile b/Gemfile index 396357a8b..782a09f32 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ gem 'foreigner', '1.6.1' # File uploading gem 'carrierwave', '0.10.0' -gem 'fog', '1.23.0' +gem 'fog', '1.24.0' gem 'mini_magick', '3.8.1' gem 'remotipart', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 88b4f5e88..f24c3f6a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,7 @@ GEM erubis (2.7.0) ethon (0.7.1) ffi (>= 1.3.0) - excon (0.39.5) + excon (0.40.0) execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) @@ -157,14 +157,16 @@ GEM fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.23.0) + fog (1.24.0) fog-brightbox fog-core (~> 1.23) fog-json + fog-radosgw (>= 0.0.2) + fog-sakuracloud (>= 0.0.4) fog-softlayer ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.5.0) + fog-brightbox (0.5.1) fog-core (~> 1.22) fog-json inflecto @@ -177,9 +179,19 @@ GEM net-ssh (>= 2.1.3) fog-json (1.0.0) multi_json (~> 1.0) - fog-softlayer (0.3.17) + fog-radosgw (0.0.3) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-sakuracloud (0.1.1) fog-core fog-json + fog-softlayer (0.3.20) + fog-core + fog-json + fog-xml (0.1.0) + fog-core + nokogiri (~> 1.5, >= 1.5.11) font-awesome-rails (4.2.0.0) railties (>= 3.2, < 5.0) foreigner (1.6.1) @@ -540,7 +552,7 @@ DEPENDENCIES faraday (= 0.9.0) faraday_middleware (= 0.9.1) fixture_builder (= 0.3.6) - fog (= 1.23.0) + fog (= 1.24.0) foreigner (= 1.6.1) foreman (= 0.62) fuubar (= 2.0.0)