diff --git a/Gemfile b/Gemfile index 61f24e2984ab147748ba8df8301726e4263fd1a8..97fb0a69227f2b1c8b72e192a2e4410315a3ae60 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' # file uploading gem 'carrierwave', '0.7.1' -gem 'fog', '1.6.0' +gem 'fog', '1.8.0' gem 'mini_magick', '3.4' # JSON and API diff --git a/Gemfile.lock b/Gemfile.lock index e5868ccf8f7510abd85b482901cdf2c84540212e..1abefdec3e769586d6501b7ffcb19f7384a9acd6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM warden (~> 1.2.1) diff-lcs (1.1.3) erubis (2.7.0) - excon (0.16.7) + excon (0.16.10) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.1.0) @@ -125,7 +125,7 @@ GEM fixture_builder (0.3.4) activerecord (>= 2) activesupport (>= 2) - fog (1.6.0) + fog (1.8.0) builder excon (~> 0.14) formatador (~> 0.2.0) @@ -198,7 +198,6 @@ GEM jquery-ui-rails (2.0.2) jquery-rails railties (>= 3.1.0) - jruby-pageant (1.1.1) json (1.7.5) jwt (0.1.5) multi_json (>= 1.0) @@ -231,8 +230,7 @@ GEM net-ssh (>= 1.99.1) net-sftp (2.0.5) net-ssh (>= 2.0.9) - net-ssh (2.6.0) - jruby-pageant (>= 1.1.1) + net-ssh (2.6.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) nokogiri (1.5.5) @@ -435,7 +433,7 @@ DEPENDENCIES faraday_middleware (= 0.9.0) fastercsv (= 1.5.5) fixture_builder (= 0.3.4) - fog (= 1.6.0) + fog (= 1.8.0) foreigner (= 1.2.1) foreman (= 0.60.2) fuubar (= 1.1.0)