diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:41:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 14:41:25 +0300 |
commit | 6e4e4023b46c786a99e1cfe8832fa5eff2728e0d (patch) | |
tree | 9ba106ae15fffc24fc4b5ad71c4d4d70ad1e5c0c /app/controllers | |
parent | 63a19a71aedcafe0148912c536a36768ed126533 (diff) |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/jira_connect/app_descriptor_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/jira_connect/app_descriptor_controller.rb b/app/controllers/jira_connect/app_descriptor_controller.rb index 137f830e40b..fee8b43aa6b 100644 --- a/app/controllers/jira_connect/app_descriptor_controller.rb +++ b/app/controllers/jira_connect/app_descriptor_controller.rb @@ -31,6 +31,7 @@ class JiraConnect::AppDescriptorController < JiraConnect::ApplicationController scopes: %w(READ WRITE DELETE), apiVersion: 1, apiMigrations: { + 'context-qsh': true, gdpr: true } } |