diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-28 05:57:26 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-28 05:57:26 +0000 |
commit | 1873e4c160ddf43a4d0950182e9c78e6352d067e (patch) | |
tree | 6ca67f351eb475d4479d4a350f7f90baf54f3304 /doc/ci | |
parent | fb276565297f8fd77f0dc1c8e51a42fec8697fce (diff) | |
parent | 59847ef0ac3e4409f6053a019121a5c7cd698812 (diff) | |
download | gitlab-ce-1873e4c160ddf43a4d0950182e9c78e6352d067e.tar.gz |
Merge branch 'docs/fix-introduced-in-text' into 'master'
Fixes Introduced in text for our renderer
See merge request gitlab-org/gitlab-ce!32308
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/runners/README.md | 3 | ||||
-rw-r--r-- | doc/ci/yaml/README.md | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index 269bd5c3428..abb503c6516 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -156,8 +156,7 @@ An admin can enable/disable a specific Runner for projects: ## Protected Runners -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13194) -> in GitLab 10.0. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13194) in GitLab 10.0. You can protect Runners from revealing sensitive information. Whenever a Runner is protected, the Runner picks only jobs created on diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 1368764bcf8..06dceeb37d4 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1899,9 +1899,8 @@ job1: ### `retry` -> [Introduced][ce-12909] in GitLab 9.5. -> [Behaviour expanded](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21758) -> in GitLab 11.5 to control on which failures to retry. +> - [Introduced][ce-12909] in GitLab 9.5. +> - [Behaviour expanded](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21758) in GitLab 11.5 to control on which failures to retry. `retry` allows you to configure how many times a job is going to be retried in case of a failure. |