summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2018-09-25 09:33:16 +0000
committerBob Van Landuyt <bob@vanlanduyt.co>2018-09-25 11:37:16 +0200
commitd3951d6944f83bd542538b0c14c9271bd0789b67 (patch)
tree27f9c8622081aeea4e82bc3f276c515c9c21da9e /changelogs
parent14e45a03a6c38960c1888dab12c6f040345e8bb5 (diff)
downloadgitlab-ce-d3951d6944f83bd542538b0c14c9271bd0789b67.tar.gz
Merge branch 'security-fj-stored-xss-in-repository-imports-11-3' into 'security-11-3'
[11.3] Stored XSS in Gitlab Merge Request from imported repository See merge request gitlab/gitlabhq!2500
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/security-fj-stored-xss-in-repository-imports.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-fj-stored-xss-in-repository-imports.yml b/changelogs/unreleased/security-fj-stored-xss-in-repository-imports.yml
new file mode 100644
index 00000000000..7520aa624c7
--- /dev/null
+++ b/changelogs/unreleased/security-fj-stored-xss-in-repository-imports.yml
@@ -0,0 +1,5 @@
+---
+title: Fix stored XSS in merge requests from imported repository
+merge_request:
+author:
+type: security