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:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-26 18:29:10 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-26 18:29:10 +0300
commite47d479feab183a41392a2f7bea654d268e0c466 (patch)
tree60bacf25ad2727dc36df628d660cfef769c6e545 /changelogs/unreleased
parent69bb8eb458236642e5c4476f5292e6229e4266cb (diff)
parent5e9fa5b2d8521c4318bd25ffa71e160e072b0c19 (diff)
Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-8' into '11-8-stable'
Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2987
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml b/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml
new file mode 100644
index 00000000000..f92d2c0dcb1
--- /dev/null
+++ b/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml
@@ -0,0 +1,5 @@
+---
+title: Fix XSS in resolve conflicts form
+merge_request:
+author:
+type: security