diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-02-26 08:43:43 -0600 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-03-04 23:43:09 -0600 |
| commit | ad7d7bedb466885440b260a458ed8176a4654404 (patch) | |
| tree | af685c6b63cfd490e144c547cf1f590115a3c824 /changelogs | |
| parent | 68df57373f1aa5c4dc012bf8a9d6526548d59bc3 (diff) | |
| download | gitlab-ce-ad7d7bedb466885440b260a458ed8176a4654404.tar.gz | |
Fix XSS in resolve conflicts form
The issue arose when the branch name contained Vue template
JavaScript. The fix is to use `v-pre` which disables Vue
compilation in a template.
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml | 5 |
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 |