diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-29 15:08:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-29 15:08:23 +0300 |
commit | d1d4dfb74a55a1b56b9451b2a844c57e05c9557f (patch) | |
tree | 4481753bb0311b55d1ff4193809a5bed847357d3 /config/application.rb | |
parent | 4011c903cf82eb37720b1b9526db595801cdff4f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 249db9c6a67..56eabc59815 100644 --- a/config/application.rb +++ b/config/application.rb @@ -417,6 +417,21 @@ module Gitlab expose: headers_to_expose end + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/oauth_application_id', headers: :any, credentials: false, methods: %i(get options) + end + + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/subscriptions.json', headers: :any, credentials: false, methods: %i(get options) + end + + allow do + origins { |source, env| source == Gitlab::CurrentSettings.jira_connect_proxy_url } + resource '/-/jira_connect/subscriptions/*', headers: :any, credentials: false, methods: %i(delete options) + end + # Cross-origin requests must be enabled for the Authorization code with PKCE OAuth flow when used from a browser. %w(/oauth/token /oauth/revoke).each do |oauth_path| allow do |