From 9159adee2d1079477752528b69565dc28cd26ec3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 21:13:02 +0000
Subject: [PATCH] Update carrierwave requirement from ~> 1.0.0 to >= 1.0, < 2.2

Updates the requirements on [carrierwave](https://github.com/carrierwaveuploader/carrierwave) to permit the latest version.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v1.0.0...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock                     | 58 ++++++++++++++++++++------------
 carrierwave-activerecord.gemspec |  2 +-
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 39550ea..52bf57a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,29 +3,35 @@ PATH
   specs:
     carrierwave-activerecord (0.3.0)
       activerecord (~> 5.0)
-      carrierwave (~> 1.0.0)
+      carrierwave (>= 1.0, < 2.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      arel (>= 9.0)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.4)
-    carrierwave (1.0.0)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    arel (9.0.0)
+    carrierwave (2.1.1)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.1.3)
     docile (1.1.5)
     ffi (1.9.18)
@@ -42,7 +48,11 @@ GEM
     guard-rspec (2.5.4)
       guard (>= 1.1)
       rspec (~> 2.11)
-    i18n (0.8.1)
+    i18n (1.8.8)
+      concurrent-ruby (~> 1.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -50,10 +60,10 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.11)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (5.10.1)
+    mimemagic (0.3.5)
+    mini_magick (4.11.0)
+    mini_mime (1.0.2)
+    minitest (5.14.3)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -62,6 +72,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (4.0.6)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.8)
@@ -75,6 +86,8 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
+    ruby-vips (2.0.17)
+      ffi (~> 1.9)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simplecov (0.14.1)
@@ -84,9 +97,10 @@ GEM
     simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.13)
+    ssrf_filter (1.0.7)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
 
 PLATFORMS
diff --git a/carrierwave-activerecord.gemspec b/carrierwave-activerecord.gemspec
index 8f70f8e..75676b4 100644
--- a/carrierwave-activerecord.gemspec
+++ b/carrierwave-activerecord.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   # CarrierWave has broken in 0.x releases.
-  gem.add_runtime_dependency 'carrierwave', '~> 1.0.0'
+  gem.add_runtime_dependency 'carrierwave', '>= 1.0', '< 2.2'
 
   # ActiveRecord 3.3 is unlikely, but prevent it just in case.
   gem.add_runtime_dependency 'activerecord', '~> 5.0'