summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-29 15:51:32 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-06 12:58:27 -0400
commit61c73575c348b3fd06047af130680f665f8ea724 (patch)
tree1d5518442b41368d68d2b76ab97d6d8d4fe0c0e3 /lib
parent5ef8bd33d03947528979540c6f7013c2b4c2a4ce (diff)
downloadgitlab-ce-61c73575c348b3fd06047af130680f665f8ea724.tar.gz
Add TaskList::Filter to pipeline
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 8348e28d0f5..bbae6ae3e74 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -1,4 +1,5 @@
require 'html/pipeline'
+require 'task_list/filter'
module Gitlab
# Custom parser for GitLab-flavored Markdown
@@ -76,9 +77,9 @@ module Gitlab
text = result[:output].to_html(save_with: save_options)
- if options[:parse_tasks]
- text = parse_tasks(text)
- end
+ # if options[:parse_tasks]
+ # text = parse_tasks(text)
+ # end
text.html_safe
end
@@ -106,7 +107,9 @@ module Gitlab
Gitlab::Markdown::SnippetReferenceFilter,
Gitlab::Markdown::CommitRangeReferenceFilter,
Gitlab::Markdown::CommitReferenceFilter,
- Gitlab::Markdown::LabelReferenceFilter
+ Gitlab::Markdown::LabelReferenceFilter,
+
+ TaskList::Filter
]
end