diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 00:09:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 00:09:06 +0000 |
| commit | 7b4418ee56d050226d94c98876990314df8d9d6c (patch) | |
| tree | 4257609b220088d60d3514ace9877ad9a4960808 /doc | |
| parent | 7ea46a9866101f15734b557d812bb52d347f63fb (diff) | |
| download | gitlab-ce-7b4418ee56d050226d94c98876990314df8d9d6c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/environments/index.md | 6 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/code_quality.md | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md index 6da568f23e7..54aa642940e 100644 --- a/doc/ci/environments/index.md +++ b/doc/ci/environments/index.md @@ -6,9 +6,7 @@ type: reference disqus_identifier: 'https://docs.gitlab.com/ee/ci/environments.html' --- -# Environments and deployments - -> Introduced in GitLab 8.9. +# Environments and deployments **(FREE)** Environments describe where code is deployed. @@ -123,7 +121,7 @@ Some variables cannot be used as environment names or URLs. For more information about the `environment` keywords, see [the `.gitlab-ci.yml` keyword reference](../yaml/README.md#environment). -## Deployment tier of environments (**FREE**) +## Deployment tier of environments > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300741) in GitLab 13.10. diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md index 42c2547a618..1733284d812 100644 --- a/doc/user/project/merge_requests/code_quality.md +++ b/doc/user/project/merge_requests/code_quality.md @@ -15,7 +15,7 @@ source code quality using GitLab Code Quality. Code Quality: -- Uses [Code Climate Engines](https://codeclimate.com), which are +- Uses [Engines](https://docs.codeclimate.com/docs/list-of-engines) supported by Code Climate, which are free and open source. Code Quality does not require a Code Climate subscription. - Runs in [pipelines](../../../ci/pipelines/index.md) using a Docker image built in the |