summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-02-13 14:16:27 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-02-13 14:16:27 +0000
commit0a3050db377cea046cb567ac5e7d0826f4fe7269 (patch)
tree541b258b4617c0be38681039080ea5347f5b2113
parent3c0d198d0c0fff5a7949f676bb6cb414908bca02 (diff)
downloadgitlab-ce-0a3050db377cea046cb567ac5e7d0826f4fe7269.tar.gz
Update CHANGELOG.md for 12.7.6
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/202520-fix_project_auth_calculation_for_group_shares.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f69f35c24ee..eb47b8aaefe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.7.6
+
+### Security (1 change)
+
+- Fix ProjectAuthorization calculation for shared groups.
+
+
## 12.7.5
### Fixed (4 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/202520-fix_project_auth_calculation_for_group_shares.yml b/changelogs/unreleased/202520-fix_project_auth_calculation_for_group_shares.yml
deleted file mode 100644
index 5dd163749f2..00000000000
--- a/changelogs/unreleased/202520-fix_project_auth_calculation_for_group_shares.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix ProjectAuthorization calculation for shared groups
-merge_request:
-author:
-type: security