From 087cd7cdba64f6c1c7eaf15fc096ff1ff214e4c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2019 21:30:24 +0000
Subject: [PATCH] Bump paperclip from 2.8.0 to 4.2.2

Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 2.8.0 to 4.2.2.
- [Release notes](https://github.com/thoughtbot/paperclip/releases)
- [Changelog](https://github.com/thoughtbot/paperclip/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/paperclip/compare/v2.8.0...v4.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 Gemfile

diff --git a/Gemfile b/Gemfile
old mode 100755
new mode 100644
index a01ec2d..f6c1b95
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'rmagick', '2.16.0'
 
 gem 'rubyzip', '~> 0.9.9'
 
-gem "paperclip", "~> 2.3"
+gem "paperclip", "~> 4.2"
 gem "sass", "3.3.4"
 # gem 'netzke-basepack'
 # Use unicorn as the web server
diff --git a/Gemfile.lock b/Gemfile.lock
index ccb302f..1fb954b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,8 +36,8 @@ GEM
     bio (1.5.2)
     builder (2.1.2)
     climate_control (0.2.0)
-    cocaine (0.6.0)
-      terrapin (= 0.6.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
     columnize (0.9.0)
     delayed_job (4.1.5)
       activesupport (>= 3.0, < 5.3)
@@ -76,10 +76,10 @@ GEM
     mixology (0.2.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (4.2.2)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
       mime-types
     passenger (6.0.2)
       rack
@@ -144,14 +144,12 @@ GEM
     spreadsheet (1.2.3)
       ruby-ole (>= 1.0)
     sprockets (1.0.2)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
     thor (0.14.6)
     tilt (2.0.9)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.55)
+    tzinfo (0.3.56)
     uuidtools (2.1.5)
     will_paginate (3.1.7)
     yui-compressor (0.11.0)
@@ -171,7 +169,7 @@ DEPENDENCIES
   meta_where
   mixology
   nokogiri (~> 1.6.1)
-  paperclip (~> 2.3)
+  paperclip (~> 4.2)
   passenger
   pg (= 0.17.1)
   rails (~> 3.0.0)