diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
commit | 806c748852e7d62dfa13fd2d039949ce0f875a12 (patch) | |
tree | ad2142c9c63d3a3aca7d71a048bda460b1767389 /doc/user | |
parent | a82e3d30b2ef625dae0d2f25324460402f960f09 (diff) | |
parent | f40403cce1a8185254e74dff54ee687b7953093b (diff) | |
download | gitlab-ce-api-remove-owned-groups.tar.gz |
Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groups
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 28 | ||||
-rw-r--r-- | doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png | bin | 0 -> 14656 bytes | |||
-rw-r--r-- | doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png | bin | 3447 -> 12917 bytes |
3 files changed, 24 insertions, 4 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index b8d24cb2d3b..64df7ee48bd 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -3,18 +3,38 @@ ## Maximum artifacts size The maximum size of the [job artifacts][art-yml] can be set in the Admin area -of your GitLab instance. The value is in MB and the default is 100MB. Note that -this setting is set for each job. +of your GitLab instance. The value is in *MB* and the default is 100MB. Note +that this setting is set for each job. 1. Go to **Admin area > Settings** (`/admin/application_settings`).  -1. Change the value of the maximum artifacts size (in MB): +1. Change the value of maximum artifacts size (in MB):  1. Hit **Save** for the changes to take effect. +[art-yml]: ../../../administration/build_artifacts -[art-yml]: ../../../administration/job_artifacts.md +## Default artifacts expiration + +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. + +1. Go to **Admin area > Settings** (`/admin/application_settings`). + +  + +1. Change the value of default expiration time ([syntax][duration-syntax]): + +  + +1. Hit **Save** for the changes to take effect. + +[art-yml]: ../../../administration/job_artifacts +[duration-syntax]: ../../../ci/yaml/README#artifactsexpire_in diff --git a/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png b/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png Binary files differnew file mode 100644 index 00000000000..50a86ede56b --- /dev/null +++ b/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png diff --git a/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png b/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png Binary files differindex b7d6671902a..33fd29e2039 100644 --- a/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png +++ b/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png |