diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-11-19 17:46:04 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-11-19 17:46:04 +0300 |
commit | f5a630111fb1499a1541e77040529f74ca6475ec (patch) | |
tree | c3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /app/helpers/gitlab_markdown_helper.rb | |
parent | 28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff) | |
parent | c8074b6b115c95c68d5f7df300a391b4eab521d5 (diff) |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/helpers/gitlab_markdown_helper.rb')
-rw-r--r-- | app/helpers/gitlab_markdown_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 2f933f4d695..5004e02ea0b 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -49,7 +49,7 @@ module GitlabMarkdownHelper return "" unless text.present? context[:project] ||= @project - + html = Gitlab::Markdown.render(text, context) context.merge!( |