Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-06-22 15:10:42 +0300
committerRémy Coutable <remy@rymai.me>2016-06-22 16:54:31 +0300
commit1e34a81cd445fce7d236821764ac6e8c474dff2c (patch)
treed8da147c760a92edd764330f8942d550e6fa1b72 /doc
parent85f324ca4f210eb65400506ad8cbb9388546a852 (diff)
Merge branch 'expiry' into 'master'
Clarify artifact expiry ## What does this MR do? Clarifies documentation about artifact expiry. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4831 Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index ef9feb683ef..1892acda29b 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -726,8 +726,8 @@ time they are uploaded and stored on GitLab.
You can use the **Keep** button on the build page to override expiration and
keep artifacts forever.
-By default, artifacts are deleted hourly (via a cron job), but they are not
-accessible after expiry.
+After expiry, artifacts are actually deleted hourly by default (via a cron job),
+but they are not accessible after expiry.
The value of `expire_in` is an elapsed time. Examples of parseable values:
- '3 mins 4 sec'