From fbf8cdef2d6f35a50b1e74f807e047ccb619fed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 6 Jan 2014 16:59:08 +0100
Subject: [PATCH] bump fog
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index a94b8d26a1..928df2aa28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem 'foreigner', '1.4.2'
# File uploading
gem 'carrierwave', '0.9.0'
-gem 'fog', '1.14.0'
+gem 'fog', '1.19.0'
gem 'mini_magick', '3.6.0'
gem 'remotipart', '1.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8124b219ed..a8bd7c6f60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
ethon (0.6.2)
ffi (>= 1.3.0)
mime-types (~> 1.18)
- excon (0.25.3)
+ excon (0.31.0)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.3.0)
@@ -119,9 +119,9 @@ GEM
fixture_builder (0.3.6)
activerecord (>= 2)
activesupport (>= 2)
- fog (1.14.0)
+ fog (1.19.0)
builder
- excon (~> 0.25.0)
+ excon (~> 0.31.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@@ -226,7 +226,7 @@ GEM
nested_form (0.3.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.6.8)
+ net-ssh (2.7.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth (0.4.7)
@@ -447,7 +447,7 @@ DEPENDENCIES
faraday (= 0.8.8)
faraday_middleware (= 0.9.0)
fixture_builder (= 0.3.6)
- fog (= 1.14.0)
+ fog (= 1.19.0)
foreigner (= 1.4.2)
foreman (= 0.62)
fuubar (= 1.1.1)
--
GitLab