diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-19 12:00:13 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-19 19:03:13 -0500 |
| commit | 08c45240493c5411c5daba8e6727cabacb324fb5 (patch) | |
| tree | 25f794f54b3695c894dc3b5a5b93b99635155b6a | |
| parent | f32bf1947d4698f23490cbad2256acb1fd8aff17 (diff) | |
| download | gitlab-ce-08c45240493c5411c5daba8e6727cabacb324fb5.tar.gz | |
Merge branch 'libre-to-core' into 'master'
Documentation: update Libre -> Core
See merge request gitlab-org/gitlab-ce!22533
(cherry picked from commit 633f59cb8e1d27ce13b532faac3b40141e002671)
bd8021ae Update Libre -> Core
be00c403 Add missing links
d3ddd3fd Fix include intro note as per documentation guidelines
| -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 e24cda8b89f..e86a3f62f18 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1602,10 +1602,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. |