From 4053cd2bff25f830fd1e2a3cdd6c95ef8ae28c7f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Nov 2024 05:58:28 -0500
Subject: [PATCH] Update faraday to version 2.12.0 (#32718)

---
 Gemfile      |  1 +
 Gemfile.lock | 34 +++++++++-------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index bc7a219789..690e2a59d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,6 +47,7 @@ gem 'color_diff', '~> 0.1'
 gem 'csv', '~> 3.2'
 gem 'discard', '~> 1.2'
 gem 'doorkeeper', '~> 5.6'
+gem 'faraday-httpclient'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 617233d702..7328afa523 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,29 +229,14 @@ GEM
     fabrication (2.31.0)
     faker (3.5.1)
       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.2)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-httpclient (2.0.1)
+      httpclient (>= 2.2)
+    faraday-net_http (3.3.0)
+      net-http
     fast_blank (1.0.1)
     fastimage (2.3.1)
     ffi (1.17.0)
@@ -430,7 +415,6 @@ GEM
     minitest (5.25.1)
     msgpack (1.7.3)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
@@ -760,7 +744,6 @@ GEM
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
       fugit (~> 1.1, >= 1.1.6)
@@ -930,6 +913,7 @@ DEPENDENCIES
   email_spec
   fabrication (~> 2.30)
   faker (~> 3.2)
+  faraday-httpclient
   fast_blank (~> 1.0)
   fastimage
   flatware-rspec