diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 12:47:46 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 12:47:46 +0000 |
commit | 0054e1567b87795cc907232a4c1e9388be5c11a5 (patch) | |
tree | b249984f8a6f53d15bb1acb8bb49c1ed2fb42243 /app/helpers/markup_helper.rb | |
parent | 996da1e52c3e1f3f1ec58f81f602167e4ff539a3 (diff) | |
parent | 0c2fdb1c342fa5eb64bb0ed02091af3c06b37c0e (diff) | |
download | gitlab-ce-0054e1567b87795cc907232a4c1e9388be5c11a5.tar.gz |
Merge branch 'ce-backport-3615' into 'master'
Refactor banzai to support referencing from group context
See merge request gitlab-org/gitlab-ce!15766
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r-- | app/helpers/markup_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 1e4be2d4bcf..f78d41a0448 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -86,6 +86,8 @@ module MarkupHelper return '' unless text.present? context[:project] ||= @project + context[:group] ||= @group + html = markdown_unsafe(text, context) prepare_for_rendering(html, context) end |