diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-02-26 17:43:43 +0300 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-03-15 00:48:35 +0300 |
| commit | 5e9fa5b2d8521c4318bd25ffa71e160e072b0c19 (patch) | |
| tree | bce23333dcb6be542261533d707ffd02f46dff89 /changelogs | |
| parent | b1268e93775a992c990a8d378491b19c59463545 (diff) | |
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 |