diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-06-16 13:12:49 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-06-16 13:14:48 +0200 |
| commit | 631524587eebbb204b057c9d356384a44b324460 (patch) | |
| tree | d762a9ff3916536349fdf842d11ffc538a9cf959 /doc | |
| parent | 0dbf4b87ee8bc53a6bb1aba28a7da4e685fedbea (diff) | |
| download | gitlab-ce-631524587eebbb204b057c9d356384a44b324460.tar.gz | |
Move branches docs to new location and copyeditdocs/branches
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/user/project/img/delete_merged_branches.png | bin | 164970 -> 0 bytes | |||
| -rw-r--r-- | doc/user/project/repository/branches/img/delete_merged_branches.png | bin | 0 -> 42891 bytes | |||
| -rw-r--r-- | doc/user/project/repository/branches/index.md (renamed from doc/user/project/branches.md) | 14 |
4 files changed, 9 insertions, 7 deletions
diff --git a/doc/README.md b/doc/README.md index fdffef9ceec..775fffab2dd 100644 --- a/doc/README.md +++ b/doc/README.md @@ -59,7 +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) + - [Delete merged branches](user/project/repository/branches/index.md#delete-merged-branches) ### Issues and Merge Requests (MRs) diff --git a/doc/user/project/img/delete_merged_branches.png b/doc/user/project/img/delete_merged_branches.png Binary files differdeleted file mode 100644 index aab6eea23f6..00000000000 --- a/doc/user/project/img/delete_merged_branches.png +++ /dev/null diff --git a/doc/user/project/repository/branches/img/delete_merged_branches.png b/doc/user/project/repository/branches/img/delete_merged_branches.png Binary files differnew file mode 100644 index 00000000000..1856a624f74 --- /dev/null +++ b/doc/user/project/repository/branches/img/delete_merged_branches.png diff --git a/doc/user/project/branches.md b/doc/user/project/repository/branches/index.md index f320715bed5..1948627ee79 100644 --- a/doc/user/project/branches.md +++ b/doc/user/project/repository/branches/index.md @@ -1,15 +1,17 @@ # Branches -## Delete Merged Branches +## Delete merged branches > [Introduced][ce-6449] in GitLab 8.14. - + -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. +This feature allows merged branches to be deleted in bulk. Only branches that +have been merged and [are not protected][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. - ---- +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" +[protected]: ../../protected_branches.md |
