From 81c305759174e2f55176356e98d264ea1c4b747d Mon Sep 17 00:00:00 2001
From: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Date: Fri, 24 Apr 2020 07:04:40 +0000
Subject: [PATCH] Update CHANGELOG.md for 12.10.1

[ci skip]
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 ...2775-group-deploy-tokens-to-repository.yml |  5 -----
 ...9-fix-newly-added-deleted-files-in-ide.yml |  5 -----
 .../unreleased/214998-fix-null-deref.yml      |  5 -----
 ...-not-showing-on-service-templates-form.yml |  5 -----
 ...-214714-fix-bug-ssh-git-create-project.yml |  5 -----
 .../migrate-vulnerability-dismissals.yml      |  5 -----
 .../unreleased/sh-fix-error-500-explore.yml   |  5 -----
 8 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 changelogs/unreleased/212775-group-deploy-tokens-to-repository.yml
 delete mode 100644 changelogs/unreleased/213239-fix-newly-added-deleted-files-in-ide.yml
 delete mode 100644 changelogs/unreleased/214998-fix-null-deref.yml
 delete mode 100644 changelogs/unreleased/215041-active-checkbox-not-showing-on-service-templates-form.yml
 delete mode 100644 changelogs/unreleased/fj-214714-fix-bug-ssh-git-create-project.yml
 delete mode 100644 changelogs/unreleased/migrate-vulnerability-dismissals.yml
 delete mode 100644 changelogs/unreleased/sh-fix-error-500-explore.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2ca4d66b07..48a55ff660d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.10.1 (2020-04-24)
+
+### Fixed (5 changes)
+
+- Fix bug creating project from git ssh. !29771
+- Fix Web IDE handling of deleting newly added files. !29783
+- Fix null dereference in /import status REST endpoint. !29886
+- Fix Service Templates missing Active toggle. !29936
+- Fix 500 error on accessing restricted levels. !30313
+
+### Changed (1 change)
+
+- Move Group Deploy Tokens to new Group-scoped Repository settings. !29290
+
+### Other (1 change)
+
+- Migration of dismissals to vulnerabilities. !29711
+
+
 ## 12.10.0 (2020-04-22)
 
 ### Removed (3 changes)
diff --git a/changelogs/unreleased/212775-group-deploy-tokens-to-repository.yml b/changelogs/unreleased/212775-group-deploy-tokens-to-repository.yml
deleted file mode 100644
index 0ecf5718427..00000000000
--- a/changelogs/unreleased/212775-group-deploy-tokens-to-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move Group Deploy Tokens to new Group-scoped Repository settings
-merge_request: 29290
-author:
-type: changed
diff --git a/changelogs/unreleased/213239-fix-newly-added-deleted-files-in-ide.yml b/changelogs/unreleased/213239-fix-newly-added-deleted-files-in-ide.yml
deleted file mode 100644
index ae346e7f507..00000000000
--- a/changelogs/unreleased/213239-fix-newly-added-deleted-files-in-ide.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Web IDE handling of deleting newly added files
-merge_request: 29783
-author:
-type: fixed
diff --git a/changelogs/unreleased/214998-fix-null-deref.yml b/changelogs/unreleased/214998-fix-null-deref.yml
deleted file mode 100644
index 1a86dbb85ca..00000000000
--- a/changelogs/unreleased/214998-fix-null-deref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix null dereference in /import status REST endpoint
-merge_request: 29886
-author:
-type: fixed
diff --git a/changelogs/unreleased/215041-active-checkbox-not-showing-on-service-templates-form.yml b/changelogs/unreleased/215041-active-checkbox-not-showing-on-service-templates-form.yml
deleted file mode 100644
index 84ff3d7b68d..00000000000
--- a/changelogs/unreleased/215041-active-checkbox-not-showing-on-service-templates-form.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Service Templates missing Active toggle
-merge_request: 29936
-author:
-type: fixed
diff --git a/changelogs/unreleased/fj-214714-fix-bug-ssh-git-create-project.yml b/changelogs/unreleased/fj-214714-fix-bug-ssh-git-create-project.yml
deleted file mode 100644
index 0f0bc7c1f49..00000000000
--- a/changelogs/unreleased/fj-214714-fix-bug-ssh-git-create-project.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug creating project from git ssh
-merge_request: 29771
-author:
-type: fixed
diff --git a/changelogs/unreleased/migrate-vulnerability-dismissals.yml b/changelogs/unreleased/migrate-vulnerability-dismissals.yml
deleted file mode 100644
index c2cc57696f2..00000000000
--- a/changelogs/unreleased/migrate-vulnerability-dismissals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Migration of dismissals to vulnerabilities
-merge_request: 29711
-author:
-type: other
diff --git a/changelogs/unreleased/sh-fix-error-500-explore.yml b/changelogs/unreleased/sh-fix-error-500-explore.yml
deleted file mode 100644
index dbf3c804b31..00000000000
--- a/changelogs/unreleased/sh-fix-error-500-explore.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 500 error on accessing restricted levels
-merge_request: 30313
-author:
-type: fixed
-- 
GitLab