summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-22 15:14:36 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-22 15:14:36 +0300
commit13a9f454ff0f8fedf6f1bd584beeb05957a395f7 (patch)
treee6d2ca06df8d78c36d03c96bc1b2569d443526bf /doc
parentf83c5d243459c06fc80a4bf0e287ed59f83e009c (diff)
downloadgitlab-ce-13a9f454ff0f8fedf6f1bd584beeb05957a395f7.tar.gz
Add changelog items to protected branches docs
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/protected_branches.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
index 330e0040998..53a6fdfa820 100644
--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -97,17 +97,20 @@ all matching branches:
![Protected branch matches](img/protected_branches_matches.png)
-## Restrict the creation of protected branches
-
## Changelog
+**8.11**
+
+- Allow creating protected branches that can't be pushed to [gitlab-org/gitlab-ce!5081][ce-5081]
+
**8.10**
-- Allow specifying protected branches using wildcards [gitlab-org/gitlab-ce!5081][ce-5081]
-- Allow creating protected branches that can't be pushed to [gitlab-org/gitlab-ce!5081][ce-4665]
+- Allow developers to merge into a protected branch without having push access [gitlab-org/gitlab-ce!4892][ce-4892]
+- Allow specifying protected branches using wildcards [gitlab-org/gitlab-ce!4665][ce-4665]
---
[ce-4665]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4665 "Allow specifying protected branches using wildcards"
+[ce-4892]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4892 "Allow developers to merge into a protected branch without having push access"
[ce-5081]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5081 "Allow creating protected branches that can't be pushed to"
[ee-restrict]: http://docs.gitlab.com/ee/user/project/protected_branches.html#restricting-push-and-merge-access-to-certain-users