diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 03:12:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 03:12:22 +0300 |
| commit | 1a35cd021a02aec1cf98dac843359837e3a1affd (patch) | |
| tree | 87e6ce1841d4329fae46b9a9f8dba6f0eaf0619b /doc/ci/yaml | |
| parent | c12e8312f6021bc8b2d9aa796fde9abc428b6a74 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml')
| -rw-r--r-- | doc/ci/yaml/index.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/workflow.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index e8ab13e1608..65955b3e4e0 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -2622,7 +2622,7 @@ docker build: **Related topics**: - [`only: changes` and `except: changes` examples](../jobs/job_control.md#onlychanges--exceptchanges-examples). -- If you use `changes` with [only allow merge requests to be merged if the pipeline succeeds](../../user/project/merge_requests/merge_when_pipeline_succeeds.md#only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds), +- If you use `changes` with [only allow merge requests to be merged if the pipeline succeeds](../../user/project/merge_requests/merge_when_pipeline_succeeds.md#require-a-successful-pipeline-for-merge), you should [also use `only:merge_requests`](../jobs/job_control.md#use-onlychanges-with-merge-request-pipelines). - [Jobs or pipelines can run unexpectedly when using `only: changes`](../jobs/job_control.md#jobs-or-pipelines-run-unexpectedly-when-using-changes). diff --git a/doc/ci/yaml/workflow.md b/doc/ci/yaml/workflow.md index 743a2639c0c..d3e815c742d 100644 --- a/doc/ci/yaml/workflow.md +++ b/doc/ci/yaml/workflow.md @@ -176,7 +176,7 @@ include: If a merge request displays `Checking pipeline status.`, but the message never goes away (the "spinner" never stops spinning), it might be due to `workflow:rules`. -This issue can happen if a project has [**Pipelines must succeed**](../../user/project/merge_requests/merge_when_pipeline_succeeds.md#only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds) +This issue can happen if a project has [**Pipelines must succeed**](../../user/project/merge_requests/merge_when_pipeline_succeeds.md#require-a-successful-pipeline-for-merge) enabled, but the `workflow:rules` prevent a pipeline from running for the merge request. For example, with this workflow, merge requests cannot be merged, because no |