From 649a973c8917525b319362237e5a55f2d03a4b0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 19:23:59 +0000
Subject: [PATCH] Bump paperclip from 2.7.0 to 4.2.2

Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 2.7.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.7.0...v4.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fd3ac71..b78d836 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     arel (2.2.3)
     awesome_print (1.0.2)
     bcrypt-ruby (3.0.1)
-    builder (3.0.0)
+    builder (3.0.4)
     cancan (1.6.7)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -44,11 +44,14 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
-    cocaine (0.2.1)
+    climate_control (0.2.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    concurrent-ruby (1.1.5)
     cucumber (1.2.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -123,7 +126,8 @@ GEM
       uglifier
     hashie (1.2.0)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
@@ -140,7 +144,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.25.1)
     multi_json (1.2.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -162,10 +166,10 @@ GEM
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     orm_adapter (0.0.7)
-    paperclip (2.7.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
     pg (0.13.2)
     polyglot (0.3.3)
@@ -249,7 +253,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.55)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -288,7 +292,7 @@ DEPENDENCIES
   omniauth
   omniauth-google
   omniauth-openid
-  paperclip (~> 2.3)
+  paperclip
   pg
   rails (= 3.1.5)
   rails-footnotes (>= 3.7)