diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 16:32:34 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 16:32:34 +0000 |
| commit | 7627af225e22e534b34899e05258c1ff0d8be4af (patch) | |
| tree | 0d97cb01aa6a7b716be339fba292d09e5bc8818f | |
| parent | d2d632544cc8e9a2504f1c6790c5ec6d451d29a2 (diff) | |
| parent | c5c46f2e3d53af1adae2eda711ba23a59c882845 (diff) | |
| download | gitlab-ce-7627af225e22e534b34899e05258c1ff0d8be4af.tar.gz | |
Merge branch 'zero-for-unlimited' into 'master'
changed minor inconsistency in help text
See merge request !9333
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 816035ec442..749c74b8110 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -192,7 +192,7 @@ = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'control-label col-sm-2' .col-sm-10 = f.number_field :max_pages_size, class: 'form-control' - .help-block Zero for unlimited + .help-block 0 for unlimited %fieldset %legend Continuous Integration @@ -525,7 +525,7 @@ = f.number_field :terminal_max_session_time, class: 'form-control' .help-block Maximum time for web terminal websocket connection (in seconds). - Set to 0 for unlimited time. + 0 for unlimited. .form-actions = f.submit 'Save', class: 'btn btn-save' |