summaryrefslogtreecommitdiff
path: root/app/views/shared/runners
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-12-05 13:09:05 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-12-05 13:09:05 +0100
commitc6c21dd4566899ca85fa3754833dfd0c70f1768a (patch)
tree82655adc40eda4fd637d02f25e6a3ff8dd10e283 /app/views/shared/runners
parent14db2a42149cc1680762cf6df443677d76dca9ee (diff)
downloadgitlab-ce-c6c21dd4566899ca85fa3754833dfd0c70f1768a.tar.gz
Update help sections for max build timeout inputs
Diffstat (limited to 'app/views/shared/runners')
-rw-r--r--app/views/shared/runners/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
index daf08d9bb2c..559b5aa9c1e 100644
--- a/app/views/shared/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -45,7 +45,7 @@
= _('Maximum job timeout')
.col-sm-10
= f.text_field :maximum_timeout_human_readable, class: 'form-control'
- .form-text.text-muted= _('This timeout will take precedence when lower than Project-defined timeout')
+ .form-text.text-muted= _('This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like "1 hour". Values without specification represent seconds.')
.form-group.row
= label_tag :tag_list, class: 'col-form-label col-sm-2' do
= _('Tags')