summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-05 08:54:04 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-05 08:54:04 +0000
commit9ae1ba2013f45a439844717a20c98802d3a9f026 (patch)
tree08cafbf0d98b0b2ee0d404be91d1ce4a00624913
parentfc615a7d8cb58c947d9bf8db6c7921b863c4a066 (diff)
downloadgitlab-ce-9ae1ba2013f45a439844717a20c98802d3a9f026.tar.gz
Update CHANGELOG.md for 12.10.4
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05828ccd0dd..1adfe51981a 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.4 (2020-05-05)
+
+### Fixed (1 change)
+
+- Add a Project's group to list of groups when parsing for codeowner entries. !30934
+
+
## 12.10.3 (2020-05-04)
### Fixed (6 changes)
diff --git a/changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml b/changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml
deleted file mode 100644
index 80c2c555f51..00000000000
--- a/changelogs/unreleased/216345-add-project-group-to-group-list-when-specified-as-owner.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add a Project's group to list of groups when parsing for codeowner entries
-merge_request: 30934
-author:
-type: fixed