diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-01 00:48:18 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-01 02:23:15 +0300 |
| commit | 270adf1cbc0903708d4df225e423e3ca02a936d3 (patch) | |
| tree | cf66266df93306ad0b569cb55f2f072e9f88966d /changelogs | |
| parent | e853495f80de79213a15f15a72171955d04f13e0 (diff) | |
Merge branch 'fix-mermaid-xss' into 'security-10-4'
[10.4] Fix stored XSS in code blocks
See merge request gitlab/gitlabhq!2316
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-stored-xss-in-code-blocks.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-stored-xss-in-code-blocks.yml b/changelogs/unreleased/fix-stored-xss-in-code-blocks.yml new file mode 100644 index 00000000000..b595459ee6b --- /dev/null +++ b/changelogs/unreleased/fix-stored-xss-in-code-blocks.yml @@ -0,0 +1,5 @@ +--- +title: Fix stored XSS in code blocks that ignore highlighting +merge_request: +author: +type: security |