diff options
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index f16d9f6325b..7a4cc61af79 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -127,7 +127,7 @@ module MarkupHelper text = wiki_page.content return '' unless text.present? - context = render_wiki_content_context(@wiki, wiki_page, context) + context = render_wiki_content_context(wiki_page.wiki, wiki_page, context) html = markup_unsafe(wiki_page.path, text, context) prepare_for_rendering(html, context) @@ -181,7 +181,8 @@ module MarkupHelper wiki: wiki, repository: wiki.repository, page_slug: wiki_page.slug, - issuable_reference_expansion_enabled: true + issuable_reference_expansion_enabled: true, + requested_path: wiki_page.path ).merge(render_wiki_content_context_container(wiki)) end @@ -263,7 +264,7 @@ module MarkupHelper end def asciidoc_unsafe(text, context = {}) - context.merge!( + context.reverse_merge!( commit: @commit, ref: @ref, requested_path: @path |