From 17e7051cc2966062f3b87db513d36e7aa6e32764 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 4 Nov 2023 16:46:37 +0000
Subject: [PATCH] chore(deps): bump carrierwave from 2.2.3 to 3.0.4

Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.2.3 to 3.0.4.
- [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/v2.2.3...v3.0.4)

---
updated-dependencies:
- dependency-name: carrierwave
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/Gemfile b/Gemfile
index 9dbd61bea..483673bb2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem 'friendly_id', '~> 5.5.0'
 ## 数据分页
 gem 'kaminari', '~> 1.2.2'
 ## 文件上传
-gem 'carrierwave', '~> 2.2.3'
+gem 'carrierwave', '~> 3.0.4'
 gem 'webp-ffi', '~> 0.4.0'
 
 # Helper
diff --git a/Gemfile.lock b/Gemfile.lock
index 925bc1458..a650bfa40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,7 +84,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     android_parser (2.6.0)
@@ -117,13 +117,12 @@ GEM
     bootsnap (1.17.0)
       msgpack (~> 1.2)
     builder (3.2.4)
-    carrierwave (2.2.3)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
+    carrierwave (3.0.4)
+      activemodel (>= 6.0.0)
+      activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
-      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     case_transform (0.2)
       activesupport
@@ -165,7 +164,7 @@ GEM
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -361,7 +360,7 @@ GEM
       pry (>= 0.12.0)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
     pundit (2.3.1)
@@ -466,7 +465,7 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
     ruby-macho (3.0.0)
     ruby-progressbar (1.11.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
@@ -510,7 +509,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    ssrf_filter (1.1.1)
+    ssrf_filter (1.1.2)
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringio (3.0.8)
@@ -579,7 +578,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootsnap (>= 1.4.7)
-  carrierwave (~> 2.2.3)
+  carrierwave (~> 3.0.4)
   cssbundling-rails (~> 1.3)
   debug (~> 1.8.0)
   devise (~> 4.9.3)