From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Oct 2023 18:39:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4226'
X-Git-Tag: live~1125
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c8fc2218e5e342ad7afc9409974fd48a733ba94b

Merge remote-tracking branch 'upstream/pull/4226'
---

c8fc2218e5e342ad7afc9409974fd48a733ba94b
diff --cc Gemfile.lock
index 03607e061,35d67d327..c8784ed7c
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -177,8 -164,11 +177,11 @@@ GE
      docile (1.4.0)
      doorkeeper (5.6.6)
        railties (>= 5)
 -    doorkeeper-i18n (5.2.6)
 +    doorkeeper-i18n (5.2.7)
        doorkeeper (>= 5.2)
+     doorkeeper-openid_connect (1.8.7)
+       doorkeeper (>= 5.5, < 5.7)
+       jwt (>= 2.5)
      dry-configurable (1.1.0)
        dry-core (~> 1.0, < 2)
        zeitwerk (~> 2.6)