summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMark Fletcher <mark@gitlab.com>2017-06-08 18:37:35 +0800
committerMark Fletcher <mark@gitlab.com>2017-06-08 18:52:56 +0800
commit0dbf4b87ee8bc53a6bb1aba28a7da4e685fedbea (patch)
treec982c31d202dd62de328406027216474954af95b /doc
parente34e5761042579686fe149f16e7ec107b80224d2 (diff)
downloadgitlab-ce-0dbf4b87ee8bc53a6bb1aba28a7da4e685fedbea.tar.gz
Document the Delete Merged Branches functionality
* Note that protected branches will not be part of the deletion
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md1
-rw-r--r--doc/api/branches.md2
-rw-r--r--doc/user/project/branches.md15
-rw-r--r--doc/user/project/img/delete_merged_branches.pngbin0 -> 164970 bytes
4 files changed, 18 insertions, 0 deletions
diff --git a/doc/README.md b/doc/README.md
index 9f12eed1471..fdffef9ceec 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -59,6 +59,7 @@ Manage files and branches from the UI (user interface):
- Branches
- [Create a branch](user/project/repository/web_editor.md#create-a-new-branch)
- [Protected branches](user/project/protected_branches.md#protected-branches)
+ - [Delete merged branches](user/project/branches.md#delete-merged-branches)
### Issues and Merge Requests (MRs)
diff --git a/doc/api/branches.md b/doc/api/branches.md
index 325d0ea4ce3..dfaa7d6fab7 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -251,6 +251,8 @@ curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gi
Will delete all branches that are merged into the project's default branch.
+Protected branches will not be deleted as part of this operation.
+
```
DELETE /projects/:id/repository/merged_branches
```
diff --git a/doc/user/project/branches.md b/doc/user/project/branches.md
new file mode 100644
index 00000000000..f320715bed5
--- /dev/null
+++ b/doc/user/project/branches.md
@@ -0,0 +1,15 @@
+# Branches
+
+## Delete Merged Branches
+
+> [Introduced][ce-6449] in GitLab 8.14.
+
+![Delete Merged Branches](img/delete_merged_branches.png)
+
+This feature allows merged branches to be deleted in bulk. Only branches that have been merged and are not protected will be deleted as part of this operation.
+
+It's particularly useful to clean up old branches that were not deleting automatically when a Merge Request was merged.
+
+---
+
+[ce-6449]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6449 "Add button to delete all merged branches"
diff --git a/doc/user/project/img/delete_merged_branches.png b/doc/user/project/img/delete_merged_branches.png
new file mode 100644
index 00000000000..aab6eea23f6
--- /dev/null
+++ b/doc/user/project/img/delete_merged_branches.png
Binary files differ