diff options
| author | Brett Walker <bwalker@gitlab.com> | 2018-09-02 18:24:27 +0300 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2018-09-05 17:19:16 +0300 |
| commit | a963721f797b451efec15702e73752c8b8830631 (patch) | |
| tree | 46b920a9b5fd0078d5cfdcdecb8e5c16be852f21 /app/helpers | |
| parent | e41b99943230240403bdca7b19d5f379892cd819 (diff) | |
render using RedCarpet if legacy_render parameter is set
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/markup_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 39e7a7fd396..a73f962e4ff 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -111,17 +111,17 @@ module MarkupHelper prepare_for_rendering(html, context) end - def render_wiki_content(wiki_page) + def render_wiki_content(wiki_page, context = {}) text = wiki_page.content return '' unless text.present? - context = { + context.merge!({ pipeline: :wiki, project: @project, project_wiki: @project_wiki, page_slug: wiki_page.slug, issuable_state_filter_enabled: true - } + }) html = case wiki_page.format |