From 631524587eebbb204b057c9d356384a44b324460 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 16 Jun 2017 13:12:49 +0200 Subject: Move branches docs to new location and copyedit --- doc/README.md | 2 +- doc/user/project/branches.md | 15 --------------- doc/user/project/img/delete_merged_branches.png | Bin 164970 -> 0 bytes .../repository/branches/img/delete_merged_branches.png | Bin 0 -> 42891 bytes doc/user/project/repository/branches/index.md | 17 +++++++++++++++++ 5 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 doc/user/project/branches.md delete mode 100644 doc/user/project/img/delete_merged_branches.png create mode 100644 doc/user/project/repository/branches/img/delete_merged_branches.png create mode 100644 doc/user/project/repository/branches/index.md 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/branches.md b/doc/user/project/branches.md deleted file mode 100644 index f320715bed5..00000000000 --- a/doc/user/project/branches.md +++ /dev/null @@ -1,15 +0,0 @@ -# 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 deleted file mode 100644 index aab6eea23f6..00000000000 Binary files a/doc/user/project/img/delete_merged_branches.png and /dev/null differ diff --git a/doc/user/project/repository/branches/img/delete_merged_branches.png b/doc/user/project/repository/branches/img/delete_merged_branches.png new file mode 100644 index 00000000000..1856a624f74 Binary files /dev/null and b/doc/user/project/repository/branches/img/delete_merged_branches.png differ diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md new file mode 100644 index 00000000000..1948627ee79 --- /dev/null +++ b/doc/user/project/repository/branches/index.md @@ -0,0 +1,17 @@ +# 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][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" +[protected]: ../../protected_branches.md -- cgit v1.2.1