summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-06-22 12:10:42 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-06-22 12:10:42 +0000
commit7e42d4992cb7e78fdde8730178ce9e3a4278cf9f (patch)
tree01bcffa2b27361b548445d21b0b778d3d0c9ef58
parent564026f6afa077ea4ab720327efcdb5a81ac2773 (diff)
parent4693b74801f9b473d270400b8954a90d389ddb54 (diff)
downloadgitlab-ce-7e42d4992cb7e78fdde8730178ce9e3a4278cf9f.tar.gz
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
-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'