diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 17:42:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 17:42:58 +0000 |
| commit | 7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7 (patch) | |
| tree | 589d36c0e93fddcea736dd6cb085a89252c6501a /app/helpers | |
| parent | 0b4b96be1f12bf2a0b9b561daba716e0468a9e61 (diff) | |
| download | gitlab-ce-7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-8-stable-ee
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/markup_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 25d56ffca2c..ad206d0e5b5 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -126,7 +126,8 @@ module MarkupHelper text = wiki_page.content return '' unless text.present? - html = markup_unsafe(wiki_page.path, text, render_wiki_content_context(@wiki, wiki_page, context)) + context = render_wiki_content_context(@wiki, wiki_page, context) + html = markup_unsafe(wiki_page.path, text, context) prepare_for_rendering(html, context) end |