diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-16 17:39:09 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-21 12:53:42 -0400 |
| commit | fca624670ac212d4241fa262dbaf1f908e7658b9 (patch) | |
| tree | 80c0666fda887f642651a3be20f7027ae0e42d5a /lib | |
| parent | 4ced630fed7cc057e66f2c795ebca17a5d6a22e6 (diff) | |
| download | gitlab-ce-fca624670ac212d4241fa262dbaf1f908e7658b9.tar.gz | |
Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles:
Removes emoji-centric tests from GFM specs :boom:
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/markdown.rb | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index f2302015437..37b250d353e 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -1,5 +1,4 @@ require 'html/pipeline' -require 'html/pipeline/gitlab' module Gitlab # Custom parser for GitLab-flavored Markdown @@ -61,19 +60,24 @@ module Gitlab reference_only_path: true ) - markdown_context = { + pipeline = HTML::Pipeline.new(filters) + + context = { + # SanitizationFilter + whitelist: sanitization_whitelist, + + # EmojiFilter asset_root: Gitlab.config.gitlab.url, asset_host: Gitlab::Application.config.asset_host, - whitelist: sanitization_whitelist, - reference_class: html_options[:class], - only_path: options[:reference_only_path], + + # ReferenceFilter current_user: current_user, - project: project + only_path: options[:reference_only_path], + project: project, + reference_class: html_options[:class] } - markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline - - result = markdown_pipeline.call(text, markdown_context) + result = pipeline.call(text, context) save_options = 0 if options[:xhtml] @@ -91,7 +95,7 @@ module Gitlab private - # Custom filters for html-pipeline: + # Filters used in our pipeline # # SanitizationFilter should come first so that all generated reference HTML # goes through untouched. @@ -101,6 +105,8 @@ module Gitlab [ HTML::Pipeline::SanitizationFilter, + Gitlab::Markdown::EmojiFilter, + Gitlab::Markdown::UserReferenceFilter, Gitlab::Markdown::IssueReferenceFilter, Gitlab::Markdown::ExternalIssueReferenceFilter, @@ -109,8 +115,6 @@ module Gitlab Gitlab::Markdown::CommitRangeReferenceFilter, Gitlab::Markdown::CommitReferenceFilter, Gitlab::Markdown::LabelReferenceFilter, - - HTML::Pipeline::Gitlab::GitlabEmojiFilter ] end |