summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-03-27 15:05:44 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-03-27 15:05:44 +0000
commit1e307c8bd0bbc8952543bf7c6a06a11f6c7c8ade (patch)
treed53c2f5050bccca346258a02962058b963f8f2bc
parentb897357b818f260a630371d62930de0aaee7368f (diff)
parent6effa6f9d539281bdbdc398b12d1ffd3990c4a0d (diff)
downloadgitlab-ce-1e307c8bd0bbc8952543bf7c6a06a11f6c7c8ade.tar.gz
Merge branch 'remove-source-branch-docs' into 'master'
Added docs for removing source branch See merge request gitlab-org/gitlab-ce!17879
-rw-r--r--doc/user/project/merge_requests/img/remove_source_branch_status.pngbin0 -> 32649 bytes
-rw-r--r--doc/user/project/merge_requests/index.md16
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/remove_source_branch_status.png b/doc/user/project/merge_requests/img/remove_source_branch_status.png
new file mode 100644
index 00000000000..1377fab54ec
--- /dev/null
+++ b/doc/user/project/merge_requests/img/remove_source_branch_status.png
Binary files differ
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 10d67729734..3640d236db4 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -77,6 +77,22 @@ You can [search and filter the results](../../search/index.md#issues-and-merge-r
![Group Issues list view](img/group_merge_requests_list_view.png)
+## Removing the source branch
+
+When creating a merge request, select the "Remove source branch when merge
+request accepted" option and the source branch will be removed when the merge
+request is merged.
+
+This option is also visible in an existing merge request next to the merge
+request button and can be selected/deselected before merging. It's only visible
+to users with [Master permissions](../../permissions.md) in the source project.
+
+If the user viewing the merge request does not have the correct permissions to
+remove the source branch and the source branch is set for removal, the merge
+request widget will show the "Removes source branch" text.
+
+![Remove source branch status](img/remove_source_branch_status.png)
+
## Authorization for merge requests
There are two main ways to have a merge request flow with GitLab: