From d110a7ce80530161252eb386df6e2b2c6d0761e5 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 27 Sep 2022 12:42:33 +0200
Subject: [PATCH] DEV: Update oauth2 and faraday (#18366)

Updated the following plugins to make this bump possible:
* [discourse-algolia](https://github.com/discourse/discourse-algolia/pull/63)
* [discourse-code-review](https://github.com/discourse/discourse-code-review/pull/149)
* [discourse-github](https://github.com/discourse/discourse-github/pull/67)
* [discourse-zendesk-plugin](https://github.com/discourse/discourse-zendesk-plugin/pull/61)
---
 Gemfile.lock | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0289fb1b468..631b0946ff6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,29 +147,10 @@ GEM
     faker (2.23.0)
       i18n (>= 1.8.11, < 2)
     fakeweb (1.3.0)
-    faraday (1.10.0)
-      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)
+    faraday (2.5.2)
+      faraday-net_http (>= 2.0, < 3.1)
       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-net_http (3.0.0)
     fast_blank (1.0.1)
     fast_xs (0.8.0)
     fastimage (2.2.6)
@@ -254,7 +235,6 @@ GEM
     msgpack (1.5.6)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
     mustache (1.1.1)
     net-http (0.2.2)
       uri
@@ -290,12 +270,12 @@ GEM
       version_gem (~> 1.1)
     oauth-tty (1.0.3)
       version_gem (~> 1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.11)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     oj (3.13.14)
     omniauth (1.9.2)
       hashie (>= 3.4.6)