summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-02-08 20:33:29 +0000
committerRuben Davila <rdavila84@gmail.com>2017-02-13 17:15:31 -0500
commit44a45369588102adcf1b11651d03cdf04085458a (patch)
tree2641230426d3d35a572af769dbe10083b3313dd8 /changelogs
parentba92981ff8faa36a2aa2a09adbc656c169a61620 (diff)
downloadgitlab-ce-44a45369588102adcf1b11651d03cdf04085458a.tar.gz
Merge branch 'asciidoctor-xss-patch' into 'security'
Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/asciidocs-xss-patch.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/asciidocs-xss-patch.yml b/changelogs/unreleased/asciidocs-xss-patch.yml
new file mode 100644
index 00000000000..f70a4b81b82
--- /dev/null
+++ b/changelogs/unreleased/asciidocs-xss-patch.yml
@@ -0,0 +1,4 @@
+---
+title: Patch Asciidocs rendering to block XSS
+merge_request:
+author: