diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 05:56:41 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 05:56:41 +0000 |
| commit | a97f4ec3615595694b11676484e9ac1ba5524a9e (patch) | |
| tree | c82ad96af00a0cdd898f26a8e1da5a9bdae14819 /doc/ci/environments.md | |
| parent | 119b128ec8415a074a73b73a7878717779c6e0f3 (diff) | |
| parent | 760b12dc6b3a927c918855e2ee85a1c0e6bddb73 (diff) | |
| download | gitlab-ce-a97f4ec3615595694b11676484e9ac1ba5524a9e.tar.gz | |
Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-labels'
# Conflicts:
# app/views/projects/labels/index.html.haml
Diffstat (limited to 'doc/ci/environments.md')
| -rw-r--r-- | doc/ci/environments.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index 7f034409580..36fd8affa5b 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -249,7 +249,7 @@ the basis of [Review apps](review_apps/index.md). NOTE: **Note:** The `name` and `url` parameters can use most of the CI/CD variables, including [predefined](variables/README.md#predefined-variables-environment-variables), -[secret](variables/README.md#secret-variables) and +[project/group ones](variables/README.md#variables) and [`.gitlab-ci.yml` variables](yaml/README.md#variables). You however cannot use variables defined under `script` or on the Runner's side. There are also other variables that are unsupported in the context of `environment:name`. You can read more about @@ -593,7 +593,7 @@ version of the app, all without leaving GitLab. >**Note:** Web terminals were added in GitLab 8.15 and are only available to project -masters and owners. +maintainers and owners. If you deploy to your environments with the help of a deployment service (e.g., the [Kubernetes integration][kube]), GitLab can open |