Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-15 18:10:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-15 18:10:04 +0300
commit68d7192881c41305da9c6aa1e3f7dd8b47f286a7 (patch)
tree015aae6f32b30437718e76c663e8383a4a4d8a22 /doc/ci/environments
parent96acc69fae1ee7d559ba7eaa4e8304c8261525e3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/environments')
-rw-r--r--doc/ci/environments/index.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index d7796895964..62c58302886 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -99,10 +99,10 @@ deploy_review:
environment:
name: review/$CI_COMMIT_REF_NAME
url: https://$CI_ENVIRONMENT_SLUG.example.com
- only:
- - branches
- except:
- - master
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ when: never
+ - if: $CI_COMMIT_BRANCH
```
In this example:
@@ -158,8 +158,8 @@ deploy_prod:
name: production
url: https://example.com
when: manual
- only:
- - master
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
```
The `when: manual` action:
@@ -200,8 +200,8 @@ deploy:
url: https://example.com
kubernetes:
namespace: production
- only:
- - master
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
```
When you use the GitLab Kubernetes integration to deploy to a Kubernetes cluster,