summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-09-24 12:10:20 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-09-24 12:10:20 +0000
commit3e8a76e67c62528e75be17481d540c4a246a7b48 (patch)
tree04ed6a2852ef7f63c17eb3e71cf94aaaeda363aa
parentc223f8a153f7ee65458e89a0be36200f97a0c5a3 (diff)
downloadgitlab-ce-3e8a76e67c62528e75be17481d540c4a246a7b48.tar.gz
Update CHANGELOG.md for 12.3.1
[ci skip]
-rw-r--r--CHANGELOG.md10
-rw-r--r--changelogs/unreleased/32408-fix-css-leak.yml5
-rw-r--r--changelogs/unreleased/32427-cannot-reorder-issue-boards.yml5
-rw-r--r--changelogs/unreleased/sh-fix-any-approver-handling.yml5
-rw-r--r--changelogs/unreleased/sh-fix-dupe-approvals-failing.yml5
5 files changed, 10 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b26a45e97e7..ed5264fae1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.3.1
+
+### Fixed (4 changes)
+
+- Fix ordering of issue board lists not being persisted. !17356
+- Fix error when duplicate users are merged in approvers list. !17406
+- Fix bug that caused a merge to show an error message. !17466
+- Fix CSS leak in job log.
+
+
## 12.3.0
### Security (23 changes)
diff --git a/changelogs/unreleased/32408-fix-css-leak.yml b/changelogs/unreleased/32408-fix-css-leak.yml
deleted file mode 100644
index 0d3d6f37b3e..00000000000
--- a/changelogs/unreleased/32408-fix-css-leak.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix CSS leak in job log
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/32427-cannot-reorder-issue-boards.yml b/changelogs/unreleased/32427-cannot-reorder-issue-boards.yml
deleted file mode 100644
index 0ad9279876e..00000000000
--- a/changelogs/unreleased/32427-cannot-reorder-issue-boards.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix ordering of issue board lists not being persisted
-merge_request: 17356
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-any-approver-handling.yml b/changelogs/unreleased/sh-fix-any-approver-handling.yml
deleted file mode 100644
index 4230dce3b74..00000000000
--- a/changelogs/unreleased/sh-fix-any-approver-handling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug that caused a merge to show an error message
-merge_request: 17466
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml b/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml
deleted file mode 100644
index c3115c5b6da..00000000000
--- a/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix error when duplicate users are merged in approvers list
-merge_request: 17406
-author:
-type: fixed