diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-18 15:07:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-18 15:07:46 +0300 |
| commit | 57834f3eb0c043602f1312845f4d5baf9f39a226 (patch) | |
| tree | ce4df60751983ba48dfe21c81d35d26ed96a6e9d /app/controllers/jira_connect | |
| parent | 1876696e875fa9de7e6344d760ac411057e628f5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/jira_connect')
| -rw-r--r-- | app/controllers/jira_connect/application_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/jira_connect/subscriptions_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/jira_connect/application_controller.rb b/app/controllers/jira_connect/application_controller.rb index b9f0ea795e1..9e55aace783 100644 --- a/app/controllers/jira_connect/application_controller.rb +++ b/app/controllers/jira_connect/application_controller.rb @@ -5,6 +5,7 @@ class JiraConnect::ApplicationController < ApplicationController CORS_ALLOWED_METHODS = { '/-/jira_connect/oauth_application_id' => %i[GET OPTIONS], + '/-/jira_connect/subscriptions.json' => %i[GET OPTIONS], '/-/jira_connect/subscriptions/*' => %i[DELETE OPTIONS] }.freeze diff --git a/app/controllers/jira_connect/subscriptions_controller.rb b/app/controllers/jira_connect/subscriptions_controller.rb index 9a732cadd94..e4022b3ef46 100644 --- a/app/controllers/jira_connect/subscriptions_controller.rb +++ b/app/controllers/jira_connect/subscriptions_controller.rb @@ -23,11 +23,11 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController push_frontend_feature_flag(:jira_connect_oauth_self_managed, @user) end + before_action :set_cors_headers before_action :allow_rendering_in_iframe, only: :index before_action :verify_qsh_claim!, only: :index before_action :allow_self_managed_content_security_policy, only: :index before_action :authenticate_user!, only: :create - before_action :set_cors_headers def index @subscriptions = current_jira_installation.subscriptions.preload_namespace_route |