From 1b9e1bb938029f4fc7a054fc2574e2b7267d3263 Mon Sep 17 00:00:00 2001
From: Peter Lejeck <peter.lejeck@gmail.com>
Date: Sun, 10 Dec 2017 20:16:59 -0800
Subject: [PATCH] Downgrade aws-sdk-s3 to aws-sdk

Works around thoughtbot/paperclip#2481 and thoughtbot/paperclip#2484
---
 Gemfile      |  2 +-
 Gemfile.lock | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8074e28bcf..47a7af6655 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'rolify'
 gem 'twitter'
 
 # Attachments
-gem 'aws-sdk-s3'
+gem 'aws-sdk', '< 3.0'
 gem 'delayed_paperclip'
 gem 'image_optim', require: false
 gem 'image_optim_pack', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index c26656ad1b..424c57e756 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,18 +80,13 @@ GEM
     arel (6.0.4)
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
-    aws-partitions (1.45.0)
-    aws-sdk-core (3.11.0)
-      aws-partitions (~> 1.0)
+    aws-sdk (2.10.100)
+      aws-sdk-resources (= 2.10.100)
+    aws-sdk-core (2.10.100)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.3.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.8.0)
-      aws-sdk-core (~> 3)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
+    aws-sdk-resources (2.10.100)
+      aws-sdk-core (= 2.10.100)
     aws-sigv4 (1.0.2)
     bcrypt (3.1.11)
     benchmark-ips (2.7.2)
@@ -608,7 +603,7 @@ DEPENDENCIES
   algoliasearch-rails
   annotate
   attr_encrypted (~> 3.0.0)
-  aws-sdk-s3
+  aws-sdk (< 3.0)
   bcrypt
   benchmark-ips
   chewy