diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /doc/ci/environments | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'doc/ci/environments')
-rw-r--r-- | doc/ci/environments/deployment_safety.md | 2 | ||||
-rw-r--r-- | doc/ci/environments/index.md | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/ci/environments/deployment_safety.md b/doc/ci/environments/deployment_safety.md index e38d9031ffd..6fda6bb0d8b 100644 --- a/doc/ci/environments/deployment_safety.md +++ b/doc/ci/environments/deployment_safety.md @@ -154,7 +154,7 @@ If you have multiple jobs for the same environment (including non-deployment job build:service-a: environment: name: production - + build:service-b: environment: name: production diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md index 55d83887423..06618a820db 100644 --- a/doc/ci/environments/index.md +++ b/doc/ci/environments/index.md @@ -400,8 +400,8 @@ stop_review: when: manual ``` -Both jobs must have the same [`rules`](../yaml/README.md#onlyexcept-basic) -or [`only/except`](../yaml/README.md#onlyexcept-basic) configuration. Otherwise, +Both jobs must have the same [`rules`](../yaml/README.md#only--except) +or [`only/except`](../yaml/README.md#only--except) configuration. Otherwise, the `stop_review` job might not be included in all pipelines that include the `deploy_review` job, and you cannot trigger `action: stop` to stop the environment automatically. @@ -676,6 +676,7 @@ fetch = +refs/environments/*:refs/remotes/origin/environments/* > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2112) in [GitLab Premium](https://about.gitlab.com/pricing/) 9.4. > - [Environment scoping for CI/CD variables was moved to all tiers](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30779) in GitLab 12.2. +> - [Environment scoping for Group CI/CD variables](https://gitlab.com/gitlab-org/gitlab/-/issues/2874) added to GitLab Premium in 13.11. You can limit the environment scope of a CI/CD variable by defining which environments it can be available for. |