diff options
author | Christian Walther <cwalther@gmx.ch> | 2015-02-21 22:12:13 +0100 |
---|---|---|
committer | Christian Walther <cwalther@gmx.ch> | 2015-03-16 22:05:52 +0100 |
commit | 90aa870c3607c170091b6034c0150f119697b0b9 (patch) | |
tree | 471bf470ce926c33557110a37f9ee5036df20af0 /lib/redcarpet | |
parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) | |
download | gitlab-ce-90aa870c3607c170091b6034c0150f119697b0b9.tar.gz |
Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
Diffstat (limited to 'lib/redcarpet')
-rw-r--r-- | lib/redcarpet/render/gitlab_html.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 714261f815c..8b0c193f3db 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -58,10 +58,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML unless @template.instance_variable_get("@project_wiki") || @project.nil? full_document = h.create_relative_links(full_document) end - if @options[:parse_tasks] - h.gfm_with_tasks(full_document) - else - h.gfm(full_document) - end + h.gfm_with_options(full_document, @options) end end |