diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 12:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 12:09:01 +0300 |
commit | c72e5ebe9938d315ec598197873e71a80168d40a (patch) | |
tree | 439bf5c40aaf774e5a301825af517cb52726f450 /doc/ci/merge_request_pipelines | |
parent | ffc43b862df32a590eae874bcbb11109b46dc8be (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/merge_request_pipelines')
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/merge_request_pipelines/index.md b/doc/ci/merge_request_pipelines/index.md index e03d767079f..448525efbde 100644 --- a/doc/ci/merge_request_pipelines/index.md +++ b/doc/ci/merge_request_pipelines/index.md @@ -89,7 +89,7 @@ Read the [documentation on Merge Trains](pipelines_for_merged_results/merge_trai The behavior of the `only: [merge_requests]` parameter is such that _only_ jobs with that parameter are run in the context of a merge request; no other jobs will be run. -However, you may want to reverse this behavior, having all of your jobs to run _except_ +However, you can invert this behavior and have all of your jobs run _except_ for one or two. Consider the following pipeline, with jobs `A`, `B`, and `C`. Imagine you want: diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md index e5a77c1f0d6..bab93392587 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md @@ -111,7 +111,7 @@ To check and set these feature flag values, please ask an administrator to: Since pipelines for merged results are a run on a merge ref of a merge request (`refs/merge-requests/<iid>/merge`), the Git reference could be overwritten at an -unexpected timing, for example, when a source or target branch is advanced. +unexpected timing. For example, when a source or target branch is advanced. In this case, the pipeline fails because of `fatal: reference is not a tree:` error, which indicates that the checkout-SHA is not found in the merge ref. diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md index 744713b0678..e5949473d01 100644 --- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md +++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md @@ -21,7 +21,7 @@ just as it works in the current state. However, instead of queuing and waiting, each item takes the completed state of the previous (pending) merge ref, adds its own changes, and starts the pipeline immediately in parallel under the assumption that everything is going to pass. -In this way, if all the pipelines in the train merge successfully, no pipeline time is wasted either queuing or retrying. +This means that if all the pipelines in the train merge successfully, no pipeline time is wasted either queuing or retrying. If the button is subsequently pressed in a different MR, instead of creating a new pipeline for the target branch, it creates a new pipeline targeting the merge result of the previous MR plus the target branch. Pipelines invalidated through failures are immediately canceled and requeued. @@ -83,7 +83,7 @@ button while the latest pipeline is running. ## Immediately merge a merge request with a merge train -In case, you have a high-priority merge request (e.g. critical patch) to be merged urgently, +In the case where you have a high-priority merge request (for example, a critical patch) to be merged urgently, you can use **Merge Immediately** option for bypassing the merge train. This is the fastest option to get the change merged into the target branch. |