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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 03607e0619289c67859df609462526fc2c8259d8,35d67d32763a5aa5d880b811a6859219ff274246..c8784ed7c2d40195cd5c3f72c31d2a1f183fc4e0
--- 1/Gemfile.lock
--- 2/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)

diff --cc config/locales/en.yml
Simple merge

diff --cc config/settings.yml
Simple merge