summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings
diff options
context:
space:
mode:
authorElan Ruusamäe <glen@delfi.ee>2018-08-17 05:41:53 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-08-17 05:41:53 +0000
commitcd1e6dd37c4f03f9205685eb6f7eb44713ec723e (patch)
tree27c895ed55f1f957b2ac692a33d499400ffe904f /app/views/admin/application_settings
parent46494f46a1345bafed1cde91ccfa4fb585a1782f (diff)
downloadgitlab-ce-cd1e6dd37c4f03f9205685eb6f7eb44713ec723e.tar.gz
doc: ci/yaml expire_in: the value is in seconds
Diffstat (limited to 'app/views/admin/application_settings')
-rw-r--r--app/views/admin/application_settings/_ci_cd.html.haml2
1 files changed, 2 insertions, 0 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"