summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-02-15 16:03:58 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-02-15 16:03:58 +0800
commitb72f00c7cfdc854640cbb118c741a116ae4fd8ba (patch)
tree1c01b0db5ac2a2c209d5db4c796cb204b11a6573 /doc/user
parentcfd839d6f5092be2f5224eddc155f6cf05cd1be6 (diff)
downloadgitlab-ce-b72f00c7cfdc854640cbb118c741a116ae4fd8ba.tar.gz
Update docs to reflect current behaviour
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/admin_area/settings/continuous_integration.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 0455881ebf2..295e0adec45 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -16,14 +16,14 @@ Note that this setting is set for each job.
1. Hit **Save** for the changes to take effect.
-[art-yml]: ../../../administration/build_artifacts.md
+[art-yml]: ../../../administration/build_artifacts
## Default artifacts expiration time
The default expiration time of the [build artifacts][art-yml] can be set in
-the Admin area of your GitLab instance. The value is in *days* and the
-default is 30 days. Note that this setting is set for each job. Set it to
-0 as never expired by default.
+the Admin area of your GitLab instance. The syntax of duration is described
+in [artifacts:expire_in][duration-syntax]. The default is `30 days`. Note that
+this setting is set for each job. Leave it blank for no default expiration.
1. Go to **Admin area > Settings** (`/admin/application_settings`).
@@ -35,4 +35,5 @@ default is 30 days. Note that this setting is set for each job. Set it to
1. Hit **Save** for the changes to take effect.
-[art-yml]: ../../../administration/build_artifacts.md
+[art-yml]: ../../../administration/build_artifacts
+[duration-syntax]: ../../../ci/yaml/README#artifactsexpire_in