summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-02-07 23:01:03 +0000
committerEvan Read <eread@gitlab.com>2019-02-07 23:01:03 +0000
commit2d70977aced471c4e602fb9cd3257c93d645f152 (patch)
tree4f778ac8b103d3bd7d613cddafd3ecc5bdf22232
parent045dcdc2f61372f95d9fd71072f5d31b88e1a12b (diff)
parenta60ded42ddc39ba2e94db6dc342c15cf7b2109ae (diff)
downloadgitlab-ce-2d70977aced471c4e602fb9cd3257c93d645f152.tar.gz
Merge branch 'docs/update-artifact-expiry' into 'master'
Update default expiry information for artifacts See merge request gitlab-org/gitlab-ce!24932
-rw-r--r--doc/user/project/pipelines/job_artifacts.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/user/project/pipelines/job_artifacts.md b/doc/user/project/pipelines/job_artifacts.md
index a8b47558c99..0d0575b1ab4 100644
--- a/doc/user/project/pipelines/job_artifacts.md
+++ b/doc/user/project/pipelines/job_artifacts.md
@@ -38,8 +38,9 @@ turn are defined with the `paths` keyword. All paths to files and directories
are relative to the repository that was cloned during the build. These uploaded
artifacts will be kept in GitLab for 1 week as defined by the `expire_in`
definition. You have the option to keep the artifacts from expiring via the
-[web interface](#browsing-job-artifacts). If you don't define an expiry date,
-the artifacts will be kept forever.
+[web interface](#browsing-job-artifacts). If the expiry time is not defined,
+it defaults to the [instance wide
+setting](../../admin_area/settings/continuous_integration.md#default-artifacts-expiration-core-only).
For more examples on artifacts, follow the [artifacts reference in
`.gitlab-ci.yml`](../../../ci/yaml/README.md#artifacts).