diff options
author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-19 12:00:13 +0000 |
---|---|---|
committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-19 12:00:13 +0000 |
commit | 633f59cb8e1d27ce13b532faac3b40141e002671 (patch) | |
tree | d496569ebfb9dd4d8cfe05daba3f7fec2e6f7a56 | |
parent | 17ef595865cde550e101806f69ead4b4394a79ae (diff) | |
parent | 6d92f0b20c6dbcdad5964fd95bb74548c943d295 (diff) | |
download | gitlab-ce-633f59cb8e1d27ce13b532faac3b40141e002671.tar.gz |
Merge branch 'libre-to-core' into 'master'
Documentation: update Libre -> Core
See merge request gitlab-org/gitlab-ce!22533
-rw-r--r-- | doc/ci/yaml/README.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 8b8bd6ec795..ec709280085 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1604,10 +1604,11 @@ test: ## `include` -> Introduced in [GitLab Edition Premium][ee] 10.5. -> Available for Starter, Premium and Ultimate [versions][gitlab-versions] since 10.6. +> Introduced in [GitLab Premium](https://about.gitlab.com/pricing/) 10.5. +> Available for Starter, Premium and Ultimate since 10.6. > Behaviour expanded in GitLab 10.8 to allow more flexible overriding. -> Available for Libre since [11.4](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21603) +> [Moved](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21603) +to GitLab Core in 11.4 Using the `include` keyword, you can allow the inclusion of external YAML files. |