diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-19 12:03:51 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-19 12:03:51 +0000 |
| commit | 3438587ccc5af497ef1eb97395fbc832c1e43163 (patch) | |
| tree | c70abd3c288fa363c357d65df18bc273fd0385ed | |
| parent | 633f59cb8e1d27ce13b532faac3b40141e002671 (diff) | |
| parent | fbe3667ae2209d844ea89ec69f2da1e3d7cfc36c (diff) | |
| download | gitlab-ce-3438587ccc5af497ef1eb97395fbc832c1e43163.tar.gz | |
Merge branch 'docs/introduced-in-fixes' into 'master'
Fix some "Introduced in" inconsistencies
See merge request gitlab-org/gitlab-ce!23154
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index f2f2497f0be..8a68185798b 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -177,11 +177,11 @@ administrator to do so. ### 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) +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22723) in GitLab 11.5. 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 +patches as attachments to the email. All attachments with a filename +ending in `.patch` will be considered patches and they will be processed ordered by name. The combined size of the patches can be 2MB. @@ -194,7 +194,7 @@ 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). +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/2383) in GitLab 10.5. When viewing the commit details page, GitLab will link to the merge request (or merge requests, if it's in more than one) containing that commit. |