diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 21:11:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 21:11:21 +0300 |
| commit | 69f0d90aad454a2b8f3c4e2f2ca31886a14a8642 (patch) | |
| tree | f79279c4c77d6938350afdd0dbc4b360d286a2ed /doc/ci/troubleshooting.md | |
| parent | dff63567c3bdad66d092989f9bf85b6faa32da65 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/troubleshooting.md')
| -rw-r--r-- | doc/ci/troubleshooting.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md index 227de02b6ee..0f57a8e00e2 100644 --- a/doc/ci/troubleshooting.md +++ b/doc/ci/troubleshooting.md @@ -141,7 +141,7 @@ be checked to make sure the jobs are added to the correct pipeline type. For example, if a merge request pipeline did not run, the jobs may have been added to a branch pipeline instead. -It's also possible that your [`workflow: rules`](yaml/README.md#workflowrules) configuration +It's also possible that your [`workflow: rules`](yaml/README.md#workflow) configuration blocked the pipeline, or allowed the wrong pipeline type. ### A job runs unexpectedly @@ -259,7 +259,7 @@ clause, multiple pipelines may run. Usually this occurs when you push a commit t a branch that has an open merge request associated with it. To [prevent duplicate pipelines](yaml/README.md#avoid-duplicate-pipelines), use -[`workflow: rules`](yaml/README.md#workflowrules) or rewrite your rules to control +[`workflow: rules`](yaml/README.md#workflow) or rewrite your rules to control which pipelines can run. ### Console workaround if job using resource_group gets stuck |