summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-05 09:14:28 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-05-05 09:14:28 +0000
commiteb108860d33f368ef218939d6a786f06267af684 (patch)
tree002085123f6508459b5def04729efeb438b24853
parentb42bf2a6d3a1a4bc8d4bc9533055eff6bd644560 (diff)
parentb61aae597a028d792c2fa9578a3d3054a15d161e (diff)
downloadgitlab-ce-eb108860d33f368ef218939d6a786f06267af684.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
-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 c12ef304111..f2b95775bac 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.2 (2020-04-30)
### Security (8 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