summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-20 09:27:48 +0000
committerPhil Hughes <me@iamphill.com>2018-03-20 09:27:48 +0000
commit1375686bdfac9db35cd1e82649a3934fbf4f207e (patch)
treeaeaead5467f0d27390c42f881bbf6dcd4800319a
parent216ead607cb3549e9d4ac36b2c1c84507fe97200 (diff)
downloadgitlab-ce-remove-source-branch-docs.tar.gz
Added docs for removing source branchremove-source-branch-docs
-rw-r--r--doc/user/project/merge_requests/img/remove_source_branch.pngbin0 -> 53683 bytes
-rw-r--r--doc/user/project/merge_requests/img/remove_source_branch_status.pngbin0 -> 117712 bytes
-rw-r--r--doc/user/project/merge_requests/img/widget_remove_source_branch.pngbin0 -> 31435 bytes
-rw-r--r--doc/user/project/merge_requests/index.md17
4 files changed, 17 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/remove_source_branch.png b/doc/user/project/merge_requests/img/remove_source_branch.png
new file mode 100644
index 00000000000..4c7d8f096f6
--- /dev/null
+++ b/doc/user/project/merge_requests/img/remove_source_branch.png
Binary files differ
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..954da80063a
--- /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/img/widget_remove_source_branch.png b/doc/user/project/merge_requests/img/widget_remove_source_branch.png
new file mode 100644
index 00000000000..bd61bf09554
--- /dev/null
+++ b/doc/user/project/merge_requests/img/widget_remove_source_branch.png
Binary files differ
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 10d67729734..178653fe273 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -77,6 +77,23 @@ 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 source branch
+
+When creating a merge request there is an option to remove the source branch. If this option is selected, the source branch will be
+removed when the merge request is merged.
+
+![Remove source branch](img/remove_source_branch.png)
+
+This option is also visible in the merge request widget and can be selected before merging. This option will be visible to users
+with master permissions in the source project.
+
+![Merge request widget remove source branch](img/widget_remove_source_branch.png)
+
+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: