summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-11-07 19:11:54 +0000
committerDouwe Maan <douwe@gitlab.com>2018-11-07 19:11:54 +0000
commit3632a8ab8b697c0401addf76c6676361cc5396bc (patch)
treeb027b6b3fdf26680f544dedc243f8641a41fc299 /doc/user
parent25e53b63ae27052b5815644656d73e1dcf96b7a4 (diff)
parentc85a19f920da1b544bbfae344145503c25e71048 (diff)
downloadgitlab-ce-3632a8ab8b697c0401addf76c6676361cc5396bc.tar.gz
Merge branch 'bvl-patches-via-mail' into 'master'
Allow to add patches to merge requests created via email Closes #40830 See merge request gitlab-org/gitlab-ce!22723
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/merge_requests/index.md17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 0a7f7d37384..6de2ab07fc4 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -166,6 +166,23 @@ administrator to do so.
![Create new merge requests by email](img/create_from_email.png)
+### Adding patches when creating a merge request via e-mail
+
+> **Note**: This feature was [implemented in GitLab 11.5](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22723)
+
+You can add commits to the merge request being created by adding
+patches as attachments to the email, all attachments with a filename
+ending in `.patch` will be considered patches. The patches will be processed
+ordered by name.
+
+The combined size of the patches can be 2MB.
+
+If the source branch from the subject does not exist, it will be
+created from the repository's HEAD or the specified target branch to
+apply the patches. The target branch can be specified using the
+[`/target_branch` quick action](../quick_actions.md). If the source
+branch already exists, the patches will be applied on top of it.
+
## Find the merge request that introduced a change
> **Note**: this feature was [implemented in GitLab 10.5](https://gitlab.com/gitlab-org/gitlab-ce/issues/2383).