From 17b51beeda0c66e9e6815517df75de69c0fdf663 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 21 Jul 2017 04:09:50 +0200
Subject: [PATCH] Bump fog-aws

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e0f18ffd..f44c0c74b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem "activerecord-import", "0.19.1"
 
 # File uploading
 
-gem "fog-aws",     "1.2.1"
+gem "fog-aws",     "1.4.0"
 gem "carrierwave", "0.11.2"
 gem "mini_magick", "4.6.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a08965454..90d9cdb58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,7 +192,7 @@ GEM
       tzinfo
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    excon (0.55.0)
+    excon (0.57.1)
     execjs (2.7.0)
     eye (0.9.1)
       celluloid (~> 0.17.3)
@@ -217,21 +217,21 @@ GEM
     fixture_builder (0.4.1)
       activerecord (>= 2)
       activesupport (>= 2)
-    fog-aws (1.2.1)
+    fog-aws (1.4.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.43.0)
+    fog-core (1.44.3)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
       fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
+      nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
@@ -787,7 +787,7 @@ DEPENDENCIES
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.11.0.1)
   fixture_builder (= 0.4.1)
-  fog-aws (= 1.2.1)
+  fog-aws (= 1.4.0)
   fuubar (= 2.2.0)
   gon (= 6.1.0)
   guard (= 2.14.1)