summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-02-14 18:00:37 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-02-15 15:31:51 +0800
commitd2d30cff552e08c4b7ec2b5e23acced8eb29cbcb (patch)
tree7d7c8055b57aee85426cd150c6f42dc1b7c0a675 /app/views/admin/application_settings
parent1452729304393978ec93b712130dff6687db01b9 (diff)
downloadgitlab-ce-d2d30cff552e08c4b7ec2b5e23acced8eb29cbcb.tar.gz
Initial implementation for default artifacts expiration
TODO: Add tests and screenshots
Diffstat (limited to 'app/views/admin/application_settings')
-rw-r--r--app/views/admin/application_settings/_form.html.haml9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 816035ec442..86ce534ea18 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -212,8 +212,15 @@
.col-sm-10
= f.number_field :max_artifacts_size, class: 'form-control'
.help-block
- Set the maximum file size each jobs's artifacts can have
+ Set the maximum file size for each job's artifacts
= link_to "(?)", help_page_path("user/admin_area/settings/continuous_integration", anchor: "maximum-artifacts-size")
+ .form-group
+ = f.label :default_artifacts_expiration, 'Default artifacts expiration (days)', class: 'control-label col-sm-2'
+ .col-sm-10
+ = f.number_field :default_artifacts_expiration, class: 'form-control'
+ .help-block
+ Set the default expiration time for each job's artifacts (0 as never expired)
+ = link_to "(?)", help_page_path("user/admin_area/settings/continuous_integration", anchor: "default-artifacts-expiration")
- if Gitlab.config.registry.enabled
%fieldset