summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-01-15 17:15:51 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-01-15 17:15:51 +0000
commitb362f87f115b2add6f9d71de6db9ecb6504bae6c (patch)
tree6bf8eb4c26eb60a4d0fa0fb155f4a30a682e7822
parentb9ca48a8952564d50414df322b825758ecbbb716 (diff)
downloadgitlab-ce-b362f87f115b2add6f9d71de6db9ecb6504bae6c.tar.gz
Update CHANGELOG.md for 11.6.4
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/security-2770-verify-bundle-import-files-11-6.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d451b48e363..9be6c68c6ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.6.4 (2019-01-15)
+
+### Security (1 change)
+
+- Validate bundle files before unpacking them.
+
+
## 11.6.3 (2019-01-04)
### Fixed (1 change)
diff --git a/changelogs/unreleased/security-2770-verify-bundle-import-files-11-6.yml b/changelogs/unreleased/security-2770-verify-bundle-import-files-11-6.yml
deleted file mode 100644
index dea40dd1ef1..00000000000
--- a/changelogs/unreleased/security-2770-verify-bundle-import-files-11-6.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate bundle files before unpacking them
-merge_request:
-author:
-type: security