Commit 7627af22 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'zero-for-unlimited' into 'master'

changed minor inconsistency in help text

See merge request !9333
parents d2d63254 c5c46f2e
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
= f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'control-label col-sm-2' = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
= f.number_field :max_pages_size, class: 'form-control' = f.number_field :max_pages_size, class: 'form-control'
.help-block Zero for unlimited .help-block 0 for unlimited
%fieldset %fieldset
%legend Continuous Integration %legend Continuous Integration
...@@ -525,7 +525,7 @@ ...@@ -525,7 +525,7 @@
= f.number_field :terminal_max_session_time, class: 'form-control' = f.number_field :terminal_max_session_time, class: 'form-control'
.help-block .help-block
Maximum time for web terminal websocket connection (in seconds). Maximum time for web terminal websocket connection (in seconds).
Set to 0 for unlimited time. 0 for unlimited.
.form-actions .form-actions
= f.submit 'Save', class: 'btn btn-save' = f.submit 'Save', class: 'btn btn-save'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment