summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-01-10 16:44:36 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-01-10 16:44:36 +0000
commitc486dd80b5f969596d2d5511f427d8851c1ed321 (patch)
treea30f48d1552573c2fbe3ae654734b36005d54d3c
parent8eee96e58215f88b165183c501f0e97b90a2007c (diff)
downloadgitlab-ce-c486dd80b5f969596d2d5511f427d8851c1ed321.tar.gz
Update CHANGELOG.md for 12.6.4
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/security-project-import-vn-master.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b02034466d..00d04b61690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.6.4
+
+### Security (1 change)
+
+- Fix private objects exposure when using Project Import functionality.
+
+
## 12.6.3
### Security (1 change)
diff --git a/changelogs/unreleased/security-project-import-vn-master.yml b/changelogs/unreleased/security-project-import-vn-master.yml
deleted file mode 100644
index 930358626fd..00000000000
--- a/changelogs/unreleased/security-project-import-vn-master.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix private objects exposure when using Project Import functionality
-merge_request:
-author:
-type: security