From 0285a3fc50643c69b0bee72fb4f74567487836da Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Wed, 31 Mar 2021 20:16:00 +0800
Subject: [PATCH] Upgrade CarrierWave 2.0.1

---
 Gemfile.lock | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c0e199ba3a..d34d783042 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,12 +77,12 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (3.2.1)
-    carrierwave (2.2.0)
+    carrierwave (2.2.1)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
-      mimemagic (>= 0.3.0)
+      marcel (~> 1.0.0)
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     carrierwave-aliyun (1.2.3)
@@ -158,7 +158,7 @@ GEM
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)
-    ffi (1.14.2)
+    ffi (1.15.0)
     form-select (0.3.2)
       rails (>= 4.2)
     fugit (1.4.2)
@@ -181,7 +181,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http_accept_language (2.1.1)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -221,9 +221,6 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
-    mimemagic (0.4.3)
-      nokogiri (~> 1)
-      rake
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
     mini_mime (1.0.3)
@@ -381,8 +378,8 @@ GEM
     ruby-push-notifications (1.3.0)
       builder (~> 3.0)
     ruby-statistics (2.1.3)
-    ruby-vips (2.0.17)
-      ffi (~> 1.9)
+    ruby-vips (2.1.0)
+      ffi (~> 1.12)
     ruby2_keywords (0.0.4)
     rucaptcha (2.5.5)
       railties (>= 3.2)