diff options
| author | Brett Walker <bwalker@gitlab.com> | 2018-09-04 08:42:23 -0500 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2018-09-05 09:19:16 -0500 |
| commit | 589776fc2e421df12c2526f9cf8cd7f3f239a21f (patch) | |
| tree | 932f66852aac6362cae5075ef8878cf160ddd19a /app/helpers/markup_helper.rb | |
| parent | a963721f797b451efec15702e73752c8b8830631 (diff) | |
| download | gitlab-ce-589776fc2e421df12c2526f9cf8cd7f3f239a21f.tar.gz | |
move logic into legacy_render_context helper method
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index a73f962e4ff..6b826dac84c 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -115,13 +115,13 @@ module MarkupHelper text = wiki_page.content return '' unless text.present? - context.merge!({ + 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 |