diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 12:08:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-01 12:08:40 +0000 |
| commit | 52522f10237f685c2535e6511d632bacdc7f6a78 (patch) | |
| tree | 9a41894e03547bda99116c0789004ef1e1c11e6c /doc/ci | |
| parent | 301f94cc9b9de6ea11e4c1e515aa772c3e468a67 (diff) | |
| download | gitlab-ce-52522f10237f685c2535e6511d632bacdc7f6a78.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/pipelines/settings.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/index.md | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md index 3633863915c..98dc02c1041 100644 --- a/doc/ci/pipelines/settings.md +++ b/doc/ci/pipelines/settings.md @@ -71,7 +71,7 @@ is selected. ## Auto-cancel redundant pipelines -You can set pending or running pipelines to cancel automatically when a new pipeline runs on the same branch. You can enable this in the project settings: +You can set pending or running pipelines to cancel automatically when a pipeline for new changes runs on the same branch. You can enable this in the project settings: 1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, select **Settings > CI/CD**. diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index 083df241958..26f95c00b51 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -444,8 +444,8 @@ workflow: If the downstream pipeline uses the same variable, the [variable is overwritten](../variables/index.md#cicd-variable-precedence) by the upstream variable value. Be sure to either: - Use a unique variable name in every project's pipeline configuration, like `PROJECT1_PIPELINE_NAME`. - - Use [`inherit:variables`](#inheritvariables) in the trigger job to select the - exact variables to forward to the downstream pipeline. + - Use [`inherit:variables`](#inheritvariables) in the trigger job and list the + exact variables you want to forward to the downstream pipeline. #### `workflow:rules` @@ -566,8 +566,8 @@ When the branch is something else: If the downstream pipeline uses the same variable, the [variable is overwritten](../variables/index.md#cicd-variable-precedence) by the upstream variable value. Be sure to either: - Use unique variable names in every project's pipeline configuration, like `PROJECT1_VARIABLE_NAME`. - - Use [`inherit:variables`](#inheritvariables) in the trigger job to select the - exact variables to forward to the downstream pipeline. + - Use [`inherit:variables`](#inheritvariables) in the trigger job and list the + exact variables you want to forward to the downstream pipeline. ## Job keywords |