From 6e4e4023b46c786a99e1cfe8832fa5eff2728e0d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 31 May 2021 11:41:25 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee --- app/controllers/jira_connect/app_descriptor_controller.rb | 1 + app/helpers/markup_helper.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'app') 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 } } diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 05a55a09271..7525481047e 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -118,6 +118,7 @@ module MarkupHelper def markup(file_name, text, context = {}) context[:project] ||= @project + context[:text_source] ||= :blob html = context.delete(:rendered) || markup_unsafe(file_name, text, context) prepare_for_rendering(html, context) end -- cgit v1.2.3