Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 7 insertions, 3 deletions

diff --git a/app/controllers/jwks_controller.rb b/app/controllers/jwks_controller.rb
index e7b839f5590..3b0e6ca2eb1 100644
--- a/app/controllers/jwks_controller.rb
+++ b/app/controllers/jwks_controller.rb
@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-class JwksController < ActionController::Base # rubocop:disable Rails/ApplicationController
+class JwksController < Doorkeeper::OpenidConnect::DiscoveryController
   def index
-    render json: { keys: keys }
+    render json: { keys: payload }
+  end
+
+  def keys
+    index
   end
 
   private
 
-  def keys
+  def payload
     [
       # We keep openid_connect_signing_key so that we can seamlessly
       # replace it with ci_jwt_signing_key and remove it on the next release.