diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 11:41:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 11:41:25 +0000 |
| commit | 6e4e4023b46c786a99e1cfe8832fa5eff2728e0d (patch) | |
| tree | 9ba106ae15fffc24fc4b5ad71c4d4d70ad1e5c0c /app/helpers | |
| parent | 63a19a71aedcafe0148912c536a36768ed126533 (diff) | |
| download | gitlab-ce-6e4e4023b46c786a99e1cfe8832fa5eff2728e0d.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/markup_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |