summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-09 13:33:38 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-09 13:33:38 +0200
commitb4828f4cf6405d27c01cc5be42334dd29a27285b (patch)
treed4cab26babaea23ae0fd15479dd6e4c473e7db4e
parent2fb99c79ffd89c5807f504247856f4bf48f6c34a (diff)
downloadgitlab-ce-b4828f4cf6405d27c01cc5be42334dd29a27285b.tar.gz
Enable markdown pipeline filters from inside gitlab.
-rw-r--r--lib/gitlab/markdown.rb19
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 17512a51658..d3e9bafb06c 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -70,14 +70,17 @@ module Gitlab
insert_piece($1)
end
- # Context passed to the markdoqwn pipeline
- markdown_context = {
- asset_root: File.join(root_url,
- Gitlab::Application.config.assets.prefix)
- }
-
- result = HTML::Pipeline::Gitlab::MarkdownPipeline.call(text,
- markdown_context)
+ # Used markdown pipelines in GitLab:
+ # GitlabEmojiFilter - performs emoji replacement.
+ #
+ # see https://gitlab.com/gitlab-org/html-pipeline-gitlab for more filters
+ filters = [
+ HTML::Pipeline::Gitlab::GitlabEmojiFilter
+ ]
+
+ markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline
+
+ result = markdown_pipeline.call(text)
text = result[:output].to_html(save_with: 0)
allowed_attributes = ActionView::Base.sanitized_allowed_attributes