Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Walther <cwalther@gmx.ch>2015-02-22 00:12:13 +0300
committerChristian Walther <cwalther@gmx.ch>2015-03-17 00:05:52 +0300
commit90aa870c3607c170091b6034c0150f119697b0b9 (patch)
tree471bf470ce926c33557110a37f9ee5036df20af0 /app/views/events/_event_note.atom.haml
parent71e146999c405ab301cd3c3e3aa03b89d46c461e (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_note.atom.haml')
-rw-r--r--app/views/events/_event_note.atom.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml
index be0e05481ed..b49c331ccf2 100644
--- a/app/views/events/_event_note.atom.haml
+++ b/app/views/events/_event_note.atom.haml
@@ -1,2 +1,2 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- = markdown note.note
+ = markdown(note.note, xhtml: true)