diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-17 11:38:38 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-17 11:38:38 +0300 |
| commit | e4ac6bbf82dd9bf1a1a8f9e7c5dbe0b577c147ce (patch) | |
| tree | e0f5992047789f4ee36ce1260353ac0448053e70 /CHANGELOG | |
| parent | 409097bd7e0f5857cf0bc5462bd47484980ec787 (diff) | |
| parent | 90aa870c3607c170091b6034c0150f119697b0b9 (diff) | |
Merge branch 'atom-xhtml-squashed' into 'master'
Fix invalid Atom feeds when using emoji, horizontal rules, or images
This is a fix for 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* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.
To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.
I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.
Thorough review appreciated since this is the first time I have used Ruby.
See merge request !344
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index bd66a92933d..ec30b09b90b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -101,6 +101,9 @@ v 7.8.1 - Fix urls for the issues when relative url was enabled v 7.8.0 + - Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther) + +v 7.8.0 (unreleased) - Fix access control and protection against XSS for note attachments and other uploads. - Replace highlight.js with rouge-fork rugments (Stefan Tatschner) - Make project search case insensitive (Hannes Rosenögger) |