summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/asciidocs-xss-patch.yml4
-rw-r--r--changelogs/unreleased/fix-xss-svg.yml4
-rw-r--r--changelogs/unreleased/labels-assigned-to-wrong-project.yml4
-rw-r--r--changelogs/unreleased/patch-rdoc-xss.yml4
5 files changed, 7 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a578bd3b569..5d12cad87e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 8.16.5 (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.16.4 (2017-02-02)
- Support non-ASCII characters in GFM autocomplete. !8729
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: