From cd3b4548535cac8c4452acc83e3c649bae191f3c Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 10 Nov 2018 19:39:51 +0100
Subject: [PATCH] Bump fog-aws

---
 Gemfile      |  2 +-
 Gemfile.lock | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 691f9b9e1..dfc7e4b9b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,7 +78,7 @@ gem "activerecord-import", "0.27.0"
 # File uploading
 
 gem "carrierwave", "1.2.3"
-gem "fog-aws",     "2.0.1"
+gem "fog-aws",     "3.3.0"
 gem "mini_magick", "4.8.0"
 
 # GUID generation
diff --git a/Gemfile.lock b/Gemfile.lock
index 0414a5a44..0449776e9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,17 +222,18 @@ GEM
       activerecord (>= 2)
       activesupport (>= 2)
       hashdiff
-    fog-aws (2.0.1)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
+    fog-aws (3.3.0)
+      fog-core (~> 2.1)
+      fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.45.0)
+    fog-core (2.1.2)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
+      mime-types
+    fog-json (1.2.0)
+      fog-core
       multi_json (~> 1.10)
     fog-xml (0.1.3)
       fog-core
@@ -792,7 +793,7 @@ DEPENDENCIES
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.12.2)
   fixture_builder (= 0.5.2.rc3)
-  fog-aws (= 2.0.1)
+  fog-aws (= 3.3.0)
   fuubar (= 2.3.2)
   gon (= 6.2.0)
   guard (= 2.14.2)