From c26be66cc9463516d9d91e0783f473fb445954d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 19 Jun 2021 18:21:13 +0000
Subject: [PATCH] Bump carrierwave from 1.3.1 to 2.2.2

Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 1.3.1 to 2.2.2.
- [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.3.1...v2.2.2)

---
updated-dependencies:
- dependency-name: carrierwave
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8fd65ce0..7d5aee01 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby File.open('.ruby-version').readline.chomp
 
 #=== CORE =====================================================================
 gem 'acts-as-taggable-on', git: 'https://github.com/Fodoj/acts-as-taggable-on', ref: 'rails-5.2'
-gem 'carrierwave', '~> 1.2'
+gem 'carrierwave', '~> 2.2'
 gem 'devise', '~> 4.7.1'
 gem 'friendly_id', '~> 5.1'
 gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
index cb2ef3be..7b16caa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,10 +110,14 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    carrierwave (2.2.2)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
     cells (4.1.7)
       declarative-builder (< 0.2.0)
       declarative-option (< 0.2.0)
@@ -139,7 +143,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -255,6 +259,9 @@ GEM
     icalendar (2.5.3)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.7.1)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
@@ -301,7 +308,8 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2021.0225)
+    mini_magick (4.11.0)
     mini_mime (1.1.0)
     mini_portile2 (2.5.1)
     minitest (5.14.4)
@@ -499,6 +507,8 @@ GEM
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
+    ruby-vips (2.1.2)
+      ffi (~> 1.12)
     rufus-scheduler (3.6.0)
       fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
@@ -563,6 +573,7 @@ GEM
     sshkit (1.21.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    ssrf_filter (1.0.7)
     stripe (1.58.0)
       rest-client (>= 1.4, < 4.0)
     stripe-ruby-mock (2.3.1)
@@ -624,7 +635,7 @@ DEPENDENCIES
   capistrano-sidekiq
   capistrano3-postgres
   capybara
-  carrierwave (~> 1.2)
+  carrierwave (~> 2.2)
   chartkick (~> 3.4.2)
   climate_control
   codecov