From e6ad411aaeff4aa79db16b4b194a5ef29828086e Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Fri, 18 Feb 2022 10:09:22 +0100
Subject: [PATCH 1/2] gems: remove hardcoded version for `zipline`

The fix was eventually released.
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index b56231cea..c556098c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -83,7 +83,7 @@ gem 'spreadsheet_architect'
 gem 'typhoeus'
 gem 'warden'
 gem 'webpacker'
-gem 'zipline', github: 'fringd/zipline', ref: 'd637bbff2' # Unreleased 1.3.0, with a fix for Ruby 3.0 kwargs
+gem 'zipline'
 gem 'zxcvbn-ruby', require: 'zxcvbn'
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 12f726dcc..a845960d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/fringd/zipline.git
-  revision: d637bbff262f59718d23a65f50b50163b8ba749f
-  ref: d637bbff2
-  specs:
-    zipline (1.3.0)
-      actionpack (>= 3.2.1, < 7.0)
-      zip_tricks (>= 4.2.1, < 6.0)
-
 GIT
   remote: https://github.com/mina-deploy/mina.git
   revision: 84fa84c7f7f94f9518ef9b7099396ab6676b5881
@@ -183,6 +174,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.3)
+    content_disposition (1.0.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -770,6 +762,10 @@ GEM
       nokogiri (~> 1.8)
     zeitwerk (2.5.4)
     zip_tricks (5.6.0)
+    zipline (1.4.1)
+      actionpack (>= 6.0, < 8.0)
+      content_disposition (~> 1.0)
+      zip_tricks (>= 4.2.1, < 6.0)
     zxcvbn-ruby (1.2.0)
 
 PLATFORMS
@@ -892,7 +888,7 @@ DEPENDENCIES
   webdrivers (~> 4.0)
   webmock
   webpacker
-  zipline!
+  zipline
   zxcvbn-ruby
 
 BUNDLED WITH

From 4cde3623be410509e879bcb9950373ad2540b3ae Mon Sep 17 00:00:00 2001
From: Pierre de La Morinerie <kemenaran@gmail.com>
Date: Fri, 18 Feb 2022 10:10:15 +0100
Subject: [PATCH 2/2] gems: remove hardcoded git URL for `mina`

It is not needed anymore.
---
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c556098c7..0a5ce4a84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,7 +120,7 @@ end
 
 group :development, :test do
   gem 'graphql-schema_comparator'
-  gem 'mina', git: 'https://github.com/mina-deploy/mina.git', require: false # Deploy
+  gem 'mina', require: false # Deploy
   gem 'pry-byebug' # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'rspec-rails'
   gem 'simple_xlsx_reader'
diff --git a/Gemfile.lock b/Gemfile.lock
index a845960d8..50bdda94b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/mina-deploy/mina.git
-  revision: 84fa84c7f7f94f9518ef9b7099396ab6676b5881
-  specs:
-    mina (1.2.3)
-      open4 (~> 1.3.4)
-      rake
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -423,6 +415,9 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0212)
+    mina (1.2.4)
+      open4 (~> 1.3.4)
+      rake
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.7.1)
@@ -838,7 +833,7 @@ DEPENDENCIES
   lograge
   logstash-event
   mailjet
-  mina!
+  mina
   openid_connect
   pg
   phonelib