From 6bf90e65202a945d7bfe5d30b60b0c1b0b0c77a5 Mon Sep 17 00:00:00 2001
From: asideofcode-dev <133222359+asideofcode-dev@users.noreply.github.com>
Date: Fri, 8 Sep 2023 13:32:35 +0000
Subject: [PATCH] Use latest commit of carrierwave-ftp

This unreleased commit is the only one that hhas support for Ruby 3.2 and above.
---
 Gemfile      |  2 +-
 Gemfile.lock | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d40b821a..90fa84909 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'bootsnap', '>= 1.4.4', require: false
 
 gem 'acts-as-taggable-on'
 gem 'carrierwave'
-gem 'carrierwave-ftp', require: 'carrierwave/storage/sftp'
+gem 'carrierwave-ftp', git: 'https://github.com/luan/carrierwave-ftp.git', ref: '5481c13', require: 'carrierwave/storage/sftp'
 gem 'cocoon'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
diff --git a/Gemfile.lock b/Gemfile.lock
index 39a2be5d2..76a816a10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/luan/carrierwave-ftp.git
+  revision: 5481c1335fd3285d2057c7056e8a4662daa68dd4
+  ref: 5481c13
+  specs:
+    carrierwave-ftp (0.4.1)
+      carrierwave (>= 0.6.2)
+      double-bag-ftps (~> 0.1.4)
+      net-sftp (~> 4.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -100,10 +110,6 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    carrierwave-ftp (0.4.1)
-      carrierwave (>= 0.6.2)
-      double-bag-ftps (= 0.1.3)
-      net-sftp (~> 2.1.2)
     chosen-rails (1.10.0)
       coffee-rails (>= 3.2)
       railties (>= 3.0)
@@ -140,7 +146,7 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    double-bag-ftps (0.1.3)
+    double-bag-ftps (0.1.4)
     erubi (1.12.0)
     execjs (2.8.1)
     fabrication (2.30.0)
@@ -221,8 +227,8 @@ GEM
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.3.3)
       net-protocol
     net-ssh (7.2.0)
@@ -472,7 +478,7 @@ DEPENDENCIES
   bullet
   capybara (>= 3.26)
   carrierwave
-  carrierwave-ftp
+  carrierwave-ftp!
   chosen-rails
   cocoon
   commonmarker