Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/app/controllers/jira_connect/public_keys_controller.rb b/app/controllers/jira_connect/public_keys_controller.rb
new file mode 100644
index 00000000000..b3144993edb
--- /dev/null
+++ b/app/controllers/jira_connect/public_keys_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module JiraConnect
+  class PublicKeysController < ::ApplicationController
+    # This is not inheriting from JiraConnect::Application controller because
+    # it doesn't need to handle JWT authentication.
+
+    feature_category :integrations
+
+    skip_before_action :authenticate_user!
+
+    def show
+      return render_404 if Feature.disabled?(:jira_connect_oauth_self_managed) || !Gitlab.com?
+
+      render plain: public_key.key
+    end
+
+    private
+
+    def public_key
+      JiraConnect::PublicKey.find(params[:id])
+    end
+  end
+end