diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 06:08:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 06:08:32 +0000 |
| commit | 0f8c2334f0e57a22bf10e4485c17f856289e4fb4 (patch) | |
| tree | 6cf14307d353a1ac89cc5f7e022c110329dd9282 /doc/user/project/merge_requests | |
| parent | ccaa94488202341c25d24f6f16a70a9f658fc742 (diff) | |
| download | gitlab-ce-0f8c2334f0e57a22bf10e4485c17f856289e4fb4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests')
| -rw-r--r-- | doc/user/project/merge_requests/creating_merge_requests.md | 6 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/merge_when_pipeline_succeeds.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md index 5b4c6d22c80..470cf2a8656 100644 --- a/doc/user/project/merge_requests/creating_merge_requests.md +++ b/doc/user/project/merge_requests/creating_merge_requests.md @@ -17,7 +17,7 @@ or through the GitLab UI. This document describes the several ways to create a merge request. -When you start a new merge request, regarless of the method, +When you start a new merge request, regardless of the method, you'll be taken to the [**New Merge Request** page](#new-merge-request-page) to fill it with information about the merge request. @@ -29,9 +29,9 @@ button and start a merge request from there. On the **New Merge Request** page, start by filling in the title and description for the merge request. If there are are already -commits on the branch, the title will be pre-filled with the first +commits on the branch, the title will be prefilled with the first line of the first commit message, and the description will be -pre-filled with any additional lines in the commit message. +prefilled with any additional lines in the commit message. The title is the only field that is mandatory in all cases. From there, you can fill it with information (title, description, diff --git a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md index e1ac8b2183c..cc3e00bc098 100644 --- a/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md +++ b/doc/user/project/merge_requests/merge_when_pipeline_succeeds.md @@ -63,7 +63,7 @@ merge request from the UI, until you make all relevant jobs pass. When this setting is enabled, a merge request is prevented from being merged if there is no pipeline. This may conflict with some use cases where [`only/except`](../../../ci/yaml/README.md#onlyexcept-advanced) rules are used and they don't generate any pipelines. -Users that expect to be able to merge a merge request in this scenario should ensure that [there is always a pipeline](https://gitlab.com/gitlab-org/gitlab-foss/issues/54226) and that it's succesful. +Users that expect to be able to merge a merge request in this scenario should ensure that [there is always a pipeline](https://gitlab.com/gitlab-org/gitlab-foss/issues/54226) and that it's successful. For example, to that on merge requests there is always a passing job even though `only/except` rules may not generate any other jobs: |