summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-10-16 05:29:49 +0000
committerSteve Azzopardi <steveazz@outlook.com>2018-10-16 13:54:25 +0200
commit9735108f17d3b757965ae563131d7cbf979419db (patch)
treeaf02bf1f18b1270b87619a0f2db52475ee04ff11
parent4fa1f7b8398e89a1ae443282d1e6110741556b01 (diff)
downloadgitlab-ce-9735108f17d3b757965ae563131d7cbf979419db.tar.gz
Merge branch 'docs/fix-link-to-when-delayed' into 'master'
Fix link to 'when delayed' YAML configuration item See merge request gitlab-org/gitlab-ce!22349
-rw-r--r--doc/ci/pipelines.md4
-rw-r--r--[-rwxr-xr-x]doc/user/project/img/issue_boards_core.pngbin61230 -> 61230 bytes
-rw-r--r--[-rwxr-xr-x]doc/user/project/img/issue_boards_premium.pngbin72434 -> 72434 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index 44589500eb0..371703a12c8 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -197,9 +197,9 @@ stage has a job with a manual action.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21767) in GitLab 11.4.
-When you do not want to run a job immediately, you can [delay the job to run after a certain period](yaml/README.md#delayed).
+When you do not want to run a job immediately, you can [delay the job to run after a certain period](yaml/README.md#when-delayed).
This is especially useful for timed incremental rollout that new code is rolled out gradually.
-For example, if you start rolling out new code and users do not experience trouble, GitLab automatically completes the deployment from 0% to 100%.
+For example, if you start rolling out new code and users do not experience trouble, GitLab automatically completes the deployment from 0% to 100%.
Alternatively, if you start rolling out and you noticed that a few users experience trouble with the version,
you can stop the timed incremental rollout by canceling the pipeline, and [rolling](environments.md#rolling-back-changes) it back to the stable version.
diff --git a/doc/user/project/img/issue_boards_core.png b/doc/user/project/img/issue_boards_core.png
index 9e819160861..9e819160861 100755..100644
--- a/doc/user/project/img/issue_boards_core.png
+++ b/doc/user/project/img/issue_boards_core.png
Binary files differ
diff --git a/doc/user/project/img/issue_boards_premium.png b/doc/user/project/img/issue_boards_premium.png
index bd9164b2961..bd9164b2961 100755..100644
--- a/doc/user/project/img/issue_boards_premium.png
+++ b/doc/user/project/img/issue_boards_premium.png
Binary files differ