diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-08-17 05:41:53 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-08-17 05:41:53 +0000 |
| commit | aecf12001f7129c44b22ce0d46559a028355d608 (patch) | |
| tree | 27c895ed55f1f957b2ac692a33d499400ffe904f | |
| parent | 46494f46a1345bafed1cde91ccfa4fb585a1782f (diff) | |
| parent | cd1e6dd37c4f03f9205685eb6f7eb44713ec723e (diff) | |
| download | gitlab-ce-aecf12001f7129c44b22ce0d46559a028355d608.tar.gz | |
Merge branch 'patch-11' into 'master'
doc: ci/yaml expire_in: the value is in seconds
See merge request gitlab-org/gitlab-ce!20983
| -rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 4 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 5037017e38a..97be658cd34 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -38,6 +38,8 @@ .form-text.text-muted Set the default expiration time for each job's artifacts. 0 for unlimited. + The default unit is in seconds, but you can define an alternative. For example: + <code>4 mins 2 sec</code>, <code>2h42min</code>. = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration') = f.submit 'Save changes', class: "btn btn-success" diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index ef740ab1c5e..abba748db8b 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1075,8 +1075,10 @@ keep artifacts forever. After their expiry, artifacts are deleted hourly by default (via a cron job), and are not accessible anymore. -The value of `expire_in` is an elapsed time. Examples of parsable values: +The value of `expire_in` is an elapsed time in seconds, unless a unit is +provided. Examples of parsable values: +- '42' - '3 mins 4 sec' - '2 hrs 20 min' - '2h20min' diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index eb6f915f3f4..76d9a4ceb03 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -21,8 +21,9 @@ that this setting is set for each job. The default expiration time of the [job artifacts][art-yml] can be set in 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. Set it to 0 if you don't want default -expiration. +this setting is set for each job. Set it to `0` if you don't want default +expiration. The default unit is in seconds. + 1. Go to **Admin area > Settings** (`/admin/application_settings`). |