From 7786e451145f28dd82cac46a9cd1727ec0117a17 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2020 20:24:08 +0000
Subject: [PATCH] Bump paperclip from 5.2.1 to 6.1.0

Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 5.2.1 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/paperclip/releases)
- [Changelog](https://github.com/thoughtbot/paperclip/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/paperclip/compare/v5.2.1...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8b3c5866e..20c60d55b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem "omniauth-facebook", "~> 4.0.0"
 gem "omniauth-google-oauth2", "~> 0.4.0"
 gem "omniauth-rails_csrf_protection", "~> 0.1.2"
 gem "omniauth-twitter", "~> 1.4.0"
-gem "paperclip", "~> 5.2.1"
+gem "paperclip", "~> 6.1.0"
 gem "paranoia", "~> 2.4.2"
 gem "pg", "~> 0.21.0"
 gem "pg_search", "~> 2.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 97ac31020..6281c35fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,8 +135,6 @@ GEM
       orm_adapter (~> 0.5.0)
       terrapin
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     cocoon (1.2.14)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
@@ -337,10 +335,10 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     method_source (1.0.0)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
+    mime-types-data (3.2020.0512)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
@@ -392,12 +390,12 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    paperclip (5.2.1)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     parallel (1.19.1)
     paranoia (2.4.2)
       activerecord (>= 4.0, < 6.1)
@@ -671,7 +669,7 @@ DEPENDENCIES
   omniauth-google-oauth2 (~> 0.4.0)
   omniauth-rails_csrf_protection (~> 0.1.2)
   omniauth-twitter (~> 1.4.0)
-  paperclip (~> 5.2.1)
+  paperclip (~> 6.1.0)
   paranoia (~> 2.4.2)
   pg (~> 0.21.0)
   pg_search (~> 2.3.0)