diff options
author | Christian Walther <cwalther@gmx.ch> | 2015-02-22 00:12:13 +0300 |
---|---|---|
committer | Christian Walther <cwalther@gmx.ch> | 2015-03-17 00:05:52 +0300 |
commit | 90aa870c3607c170091b6034c0150f119697b0b9 (patch) | |
tree | 471bf470ce926c33557110a37f9ee5036df20af0 /app/views/events/_event_push.atom.haml | |
parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) |
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 'app/views/events/_event_push.atom.haml')
-rw-r--r-- | app/views/events/_event_push.atom.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml index 2b63519edac..2fb9f7ec246 100644 --- a/app/views/events/_event_push.atom.haml +++ b/app/views/events/_event_push.atom.haml @@ -6,7 +6,7 @@ %i at = commit[:timestamp].to_time.to_s(:short) - %blockquote= markdown(escape_once(commit[:message])) + %blockquote= markdown(escape_once(commit[:message]), xhtml: true) - if event.commits_count > 15 %p %i |