summaryrefslogtreecommitdiff
path: root/app/controllers/jira_connect/oauth_application_ids_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/jira_connect/oauth_application_ids_controller.rb')
-rw-r--r--app/controllers/jira_connect/oauth_application_ids_controller.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/jira_connect/oauth_application_ids_controller.rb b/app/controllers/jira_connect/oauth_application_ids_controller.rb
index 05c23210da2..a84b47f4c8b 100644
--- a/app/controllers/jira_connect/oauth_application_ids_controller.rb
+++ b/app/controllers/jira_connect/oauth_application_ids_controller.rb
@@ -5,9 +5,10 @@ module JiraConnect
feature_category :integrations
skip_before_action :authenticate_user!
+ skip_before_action :verify_authenticity_token
def show
- if Feature.enabled?(:jira_connect_oauth_self_managed) && jira_connect_application_key.present?
+ if show_application_id?
render json: { application_id: jira_connect_application_key }
else
head :not_found
@@ -16,6 +17,12 @@ module JiraConnect
private
+ def show_application_id?
+ return if Gitlab.com?
+
+ Feature.enabled?(:jira_connect_oauth_self_managed) && jira_connect_application_key.present?
+ end
+
def jira_connect_application_key
Gitlab::CurrentSettings.jira_connect_application_key.presence
end