summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-04-03 09:57:31 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-03 14:47:07 +0100
commit39cb31f16a79056efd280162b79b8da37b469b55 (patch)
treee945fae5387cec10d1db56c7cac83289ab09c0b9 /changelogs
parentf2ca442971ff7c416e116143a95078226d719ee2 (diff)
downloadgitlab-ce-39cb31f16a79056efd280162b79b8da37b469b55.tar.gz
Merge branch '42028-xss-diffs-10-6' into 'security-10-6'
Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/42028-xss-diffs.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/42028-xss-diffs.yml b/changelogs/unreleased/42028-xss-diffs.yml
new file mode 100644
index 00000000000..a05f9d3c78d
--- /dev/null
+++ b/changelogs/unreleased/42028-xss-diffs.yml
@@ -0,0 +1,5 @@
+---
+title: Fix XSS on diff view stored on filenames
+merge_request:
+author:
+type: security