summaryrefslogtreecommitdiff
path: root/app/helpers/gitlab_markdown_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-14 20:18:49 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-14 20:18:49 +0200
commitb093cb35d1614a48e980c5ccfca3a8d307d732f7 (patch)
tree1342da63d6e7ec388d5190c881eb777542263880 /app/helpers/gitlab_markdown_helper.rb
parentda9746e59a46005a0948d34bfd94ae715143c3f7 (diff)
downloadgitlab-ce-b093cb35d1614a48e980c5ccfca3a8d307d732f7.tar.gz
Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines
Diffstat (limited to 'app/helpers/gitlab_markdown_helper.rb')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index c6fff1b8ecf..2f933f4d695 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -65,13 +65,16 @@ module GitlabMarkdownHelper
end
def asciidoc(text)
- Gitlab::Asciidoc.render(text, {
- commit: @commit,
- project: @project,
- project_wiki: @project_wiki,
+ Gitlab::Asciidoc.render(text,
+ project: @project,
+ current_user: (current_user if defined?(current_user)),
+
+ # RelativeLinkFilter
+ project_wiki: @project_wiki,
requested_path: @path,
- ref: @ref
- })
+ ref: @ref,
+ commit: @commit
+ )
end
# Return the first line of +text+, up to +max_chars+, after parsing the line