Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 0 deletions

diff --git a/app/controllers/jira_connect/oauth_application_ids_controller.rb b/app/controllers/jira_connect/oauth_application_ids_controller.rb
new file mode 100644
index 00000000000..05c23210da2
--- /dev/null
+++ b/app/controllers/jira_connect/oauth_application_ids_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module JiraConnect
+  class OauthApplicationIdsController < ::ApplicationController
+    feature_category :integrations
+
+    skip_before_action :authenticate_user!
+
+    def show
+      if Feature.enabled?(:jira_connect_oauth_self_managed) && jira_connect_application_key.present?
+        render json: { application_id: jira_connect_application_key }
+      else
+        head :not_found
+      end
+    end
+
+    private
+
+    def jira_connect_application_key
+      Gitlab::CurrentSettings.jira_connect_application_key.presence
+    end
+  end
+end