Merge pull request #3905 from consul/dependabot/bundler/paperclip-6.1.0

Bump paperclip from 5.2.1 to 6.1.0

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"

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)