summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-06-24 21:58:49 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-06-24 21:58:49 +0000
commitf9946e2f60824dedb75cbf766f8a8fd03b31b11d (patch)
treec1984d7522c1df978ff64d3d7687c3ef9b5c03d0
parentfa5b74e48da4bb436edd1683f487e3b0640fd664 (diff)
downloadgitlab-ce-f9946e2f60824dedb75cbf766f8a8fd03b31b11d.tar.gz
Update CHANGELOG.md for 12.10.12
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/correctly-count-wiki-pages-in-sidebar.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a656e28a1..bdd0c631b67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.10.12 (2020-06-24)
+
+### Fixed (1 change)
+
+- Correctly count wiki pages in sidebar. !30508
+
+
## 12.10.11 (2020-06-10)
- No changes.
diff --git a/changelogs/unreleased/correctly-count-wiki-pages-in-sidebar.yml b/changelogs/unreleased/correctly-count-wiki-pages-in-sidebar.yml
deleted file mode 100644
index f98a9e9cecf..00000000000
--- a/changelogs/unreleased/correctly-count-wiki-pages-in-sidebar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Correctly count wiki pages in sidebar
-merge_request: 30508
-author:
-type: fixed