From af4e2e6b95c3ad763c549e05776c5fe807d088ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2019 18:06:40 +0000
Subject: [PATCH] Update paperclip requirement from ~> 4.2 to >= 4.2, < 7.0

Updates the requirements on [paperclip](https://github.com/thoughtbot/paperclip) to permit the latest version.
- [Release notes](https://github.com/thoughtbot/paperclip/releases)
- [Changelog](https://github.com/thoughtbot/paperclip/blob/master/NEWS)
- [Commits](https://github.com/thoughtbot/paperclip/compare/v4.3.7...v6.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 121 +++++++++++++++++++++++++++------------------------
 para.gemspec |   2 +-
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 94518a42..50b7691c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,20 +13,20 @@ PATH
       active_decorator (~> 1.0)
       activejob-status
       bootstrap-sass (~> 3.3.0)
-      cancancan (~> 1.9)
-      closure_tree (~> 6.2)
+      cancancan (~> 3.0)
+      closure_tree (~> 7.0)
       cocoon
       coffee-rails
       compass-rails
       deep_cloneable (>= 2.2.1)
       devise (>= 3.0, < 5.0)
       font-awesome-rails (~> 4.7.0)
-      font-awesome-sass (~> 4.7.0)
+      font-awesome-sass (>= 4.7.0, <= 6.0.0)
       friendly_id (~> 5.1)
       haml-rails
       jquery-rails
       kaminari
-      paperclip (~> 4.2)
+      paperclip (>= 4.2, < 7.0)
       pg
       rails (>= 4.0, <= 6.0)
       rails-i18n
@@ -69,7 +69,8 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_decorator (1.1.1)
+    active_decorator (1.3.1)
+      activesupport
     activejob (5.0.0.1)
       activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
@@ -88,7 +89,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    autoprefixer-rails (9.4.2)
+    autoprefixer-rails (9.7.0)
       execjs
     bcrypt (3.1.11)
     bootstrap-kaminari-views (0.0.5)
@@ -98,15 +99,13 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     builder (3.2.3)
-    cancancan (1.17.0)
+    cancancan (3.0.1)
     chunky_png (1.3.11)
     climate_control (0.2.0)
-    closure_tree (6.6.0)
-      activerecord (>= 4.1.0)
-      with_advisory_lock (>= 3.0.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
-    cocoon (1.2.12)
+    closure_tree (7.0.0)
+      activerecord (>= 4.2.10)
+      with_advisory_lock (>= 4.0.0)
+    cocoon (1.2.14)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -120,10 +119,10 @@ GEM
       sass (~> 3.1)
     compass-rails (2.0.0)
       compass (>= 0.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crass (1.0.3)
-    deep_cloneable (2.3.2)
-      activerecord (>= 3.1.0, < 6)
+    deep_cloneable (3.0.0)
+      activerecord (>= 3.1.0, < 7)
     devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -132,17 +131,17 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.9.25)
-    font-awesome-rails (4.7.0.4)
-      railties (>= 3.2, < 6.0)
-    font-awesome-sass (4.7.0)
-      sass (>= 3.2)
-    friendly_id (5.2.4)
+    ffi (1.11.1)
+    font-awesome-rails (4.7.0.5)
+      railties (>= 3.2, < 6.1)
+    font-awesome-sass (5.11.2)
+      sassc (>= 1.11)
+    friendly_id (5.3.0)
       activerecord (>= 4.0.0)
     fssm (0.2.10)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    haml (5.0.4)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (1.0.0)
@@ -156,7 +155,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
@@ -171,23 +170,23 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (3.1)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.0)
+    mime-types-data (3.2019.1009)
+    mimemagic (0.3.3)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.13.0)
     nio4r (1.2.1)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
-    pg (1.1.3)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
+    pg (1.1.4)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
     rack (2.0.3)
@@ -210,7 +209,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (5.1.2)
+    rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     railties (5.0.0.1)
@@ -227,39 +226,43 @@ GEM
       i18n
       polyamorous (~> 1.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    roo (2.7.1)
+    roo (2.8.2)
       nokogiri (~> 1)
-      rubyzip (~> 1.1, < 2.0.0)
+      rubyzip (>= 1.2.1, < 2.0.0)
     roo-xls (1.2.0)
       nokogiri
       roo (>= 2.0.0, < 3)
       spreadsheet (> 0.9.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby-ole (1.2.12.1)
-    ruby_parser (3.11.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    ruby-ole (1.2.12.2)
+    ruby_parser (3.14.1)
       sexp_processor (~> 4.9)
-    rubyzip (1.2.2)
-    sass (3.7.2)
+    rubyzip (1.3.0)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selectize-rails (0.12.3)
-    sexp_processor (4.11.0)
+    sexp_processor (4.13.0)
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
@@ -268,7 +271,7 @@ GEM
       redactor-rails
       selectize-rails
       simple_form
-    spreadsheet (1.1.8)
+    spreadsheet (1.2.5)
       ruby-ole (>= 1.0)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
@@ -277,15 +280,17 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.8.0)
+    temple (0.8.2)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.19.1)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.10)
     truncate_html (0.9.3)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     vertebra (0.1.3)
       rails (>= 3.1, <= 6.0)
@@ -294,7 +299,7 @@ GEM
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    with_advisory_lock (4.0.0)
+    with_advisory_lock (4.6.0)
       activerecord (>= 4.2)
 
 PLATFORMS
diff --git a/para.gemspec b/para.gemspec
index a9b912eb..6f24927f 100644
--- a/para.gemspec
+++ b/para.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'simple_form_extension', '>= 1.4.5'
   s.add_dependency 'active_decorator', '~> 1.0'
   s.add_dependency 'cocoon'
-  s.add_dependency 'paperclip', '~> 4.2'
+  s.add_dependency 'paperclip', '>= 4.2', '< 7.0'
   s.add_dependency 'cancancan', '~> 3.0'
   s.add_dependency 'kaminari'
   s.add_dependency 'ransack'