From f64dae7890df0199cecffc284629873012af80e9 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 19 May 2017 11:10:08 +0200 Subject: Add docs for protected branches deletion feature Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/32218 --- doc/user/project/img/protected_branches_delete.png | Bin 0 -> 21510 bytes doc/user/project/protected_branches.md | 27 +++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 doc/user/project/img/protected_branches_delete.png diff --git a/doc/user/project/img/protected_branches_delete.png b/doc/user/project/img/protected_branches_delete.png new file mode 100644 index 00000000000..cfdfe6c6c29 Binary files /dev/null and b/doc/user/project/img/protected_branches_delete.png differ diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index f7a686d2ccf..6024052a869 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -97,8 +97,33 @@ all matching branches: ![Protected branch matches](img/protected_branches_matches.png) +## Deleting a protected branch + +> [Introduced][ce-21393] in GitLab 9.3. + +From time to time, it may be required to delete or clean up branches that are +protected. + +User with [Master permissions][perm] and up can manually delete protected +branches via GitLab's web interface: + +1. Visit **Repository > Branches** +1. Click on the delete icon next to the branch you wish to delete +1. In order to prevent accidental deletion, an additional confirmation is + required + + ![Delete protected branches](img/protected_branches_delete.png) + +Deleting a protected branch is only allowed via the web interface, not via Git. +This means that you can't accidentally delete a protected branch from your +command line or a Git client application. + ## Changelog +**9.2** + +- Allow deletion of protected branches via the web interface [gitlab-org/gitlab-ce#21393][ce-21393] + **8.11** - Allow creating protected branches that can't be pushed to [gitlab-org/gitlab-ce!5081][ce-5081] @@ -113,4 +138,6 @@ all matching branches: [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" +[ce-21393]: https://gitlab.com/gitlab-org/gitlab-ce/issues/21393 [ee-restrict]: http://docs.gitlab.com/ee/user/project/protected_branches.html#restricting-push-and-merge-access-to-certain-users +[perm]: ../permissions.md -- cgit v1.2.1