From 6d53f989f3de40529b2302f2975309f01ca16bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 1 Aug 2013 18:19:57 +0200
Subject: [PATCH] bump fog
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 4545c6f300..fd62809bae 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 cdada42fd4..6644b86f97 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)
--
GitLab