From 254fd156f06f8b83faa8b5964d3f1e47aed440b5 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sat, 27 Jan 2024 00:10:17 +1030
Subject: [PATCH] Remove faraday_middleware (#3604)

* Remove faraday_middleware

* Remove outdated migration

* Remove outdated migration
---
 Gemfile      |  1 -
 Gemfile.lock | 35 +++++++----------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 869052b71..0f9b17c83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -124,7 +124,6 @@ gem 'rack-protection', '>= 2.0.1'
 gem 'mailboxer', '>= 0.15.1'
 
 gem 'faraday'
-gem 'faraday_middleware'
 
 gem 'rack-cors'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 948223e69..a1fd8af5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -251,31 +251,10 @@ GEM
       railties (>= 5.0.0)
     faker (3.2.3)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.16.3)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
@@ -396,7 +375,8 @@ GEM
     moneta (1.0.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.3.0)
+    net-http (0.4.1)
+      uri
     net-imap (0.3.7)
       date
       net-protocol
@@ -581,7 +561,6 @@ GEM
     ruby-units (4.0.1)
     ruby-vips (2.2.0)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -644,6 +623,7 @@ GEM
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.16.0)
+    uri (0.13.0)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
@@ -709,7 +689,6 @@ DEPENDENCIES
   factory_bot_rails
   faker
   faraday
-  faraday_middleware
   flickraw
   font-awesome-sass
   friendly_id