diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-02-15 00:35:49 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-02-15 00:35:49 +0300 |
| commit | c34e217199c6c454d6bb15ed5794f13d0e46614d (patch) | |
| tree | f7d98c671c634439c18098e01eb0d19d3eefe4bf | |
| parent | 50e56edfe4f8765b595006735f93e6d634967f6d (diff) | |
Update CHANGELOG.md for 8.15.6
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/asciidocs-xss-patch.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-xss-svg.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/labels-assigned-to-wrong-project.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-rdoc-xss.yml | 4 |
5 files changed, 7 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d1144c1494b..348a1cfa5a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 8.15.6 (2017-02-14) + +- Patch Asciidocs rendering to block XSS. +- Fix XSS vulnerability in SVG attachments. +- Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects. +- Patch XSS vulnerability in RDOC support. + ## 8.15.5 (2017-01-20) - Ensure export files are removed after a namespace is deleted. diff --git a/changelogs/unreleased/asciidocs-xss-patch.yml b/changelogs/unreleased/asciidocs-xss-patch.yml deleted file mode 100644 index f70a4b81b82..00000000000 --- a/changelogs/unreleased/asciidocs-xss-patch.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Patch Asciidocs rendering to block XSS -merge_request: -author: diff --git a/changelogs/unreleased/fix-xss-svg.yml b/changelogs/unreleased/fix-xss-svg.yml deleted file mode 100644 index dbb956c3910..00000000000 --- a/changelogs/unreleased/fix-xss-svg.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix XSS vulnerability in SVG attachments -merge_request: -author: diff --git a/changelogs/unreleased/labels-assigned-to-wrong-project.yml b/changelogs/unreleased/labels-assigned-to-wrong-project.yml deleted file mode 100644 index 0f4a88075a4..00000000000 --- a/changelogs/unreleased/labels-assigned-to-wrong-project.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects. -merge_request: -author: diff --git a/changelogs/unreleased/patch-rdoc-xss.yml b/changelogs/unreleased/patch-rdoc-xss.yml deleted file mode 100644 index b428f5435e3..00000000000 --- a/changelogs/unreleased/patch-rdoc-xss.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Patch XSS vulnerability in RDOC support -merge_request: -author: |