diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-05 00:17:58 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-05 00:17:58 +0000 |
| commit | 0c7626f3a5c5970a68cb6cba64b46e7d8b81687f (patch) | |
| tree | a2715dfa53edf631bb7023188b5024f4a2d2fb8e /app/helpers | |
| parent | 2f6ded6df9eeea8b38861a99dd93d5bba1ab7b0a (diff) | |
| parent | 8eaeda081615346e1d428e9f4f4402d3bb24b9f1 (diff) | |
| download | gitlab-ce-0c7626f3a5c5970a68cb6cba64b46e7d8b81687f.tar.gz | |
Merge branch 'rs-frontmatter-pre' into 'master'
Properly display YAML front matter in Markdown
See merge request !3072
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 89d2a648494..2f760af02fd 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -50,6 +50,8 @@ module GitlabMarkdownHelper context[:project] ||= @project + text = Banzai.pre_process(text, context) + html = Banzai.render(text, context) context.merge!( |