diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-14 22:54:46 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-15 15:31:51 +0800 |
| commit | 53c94f9ea25c9d6a25b58a01db5f855f0719dbf4 (patch) | |
| tree | 821e1b9aabf4d9602002f551e25c8cc50d252463 /app/views/admin | |
| parent | ac872078486145f43e8a42dbd60ed47be70a301f (diff) | |
| download | gitlab-ce-53c94f9ea25c9d6a25b58a01db5f855f0719dbf4.tar.gz | |
Use the same syntax for default expiration
Feedback:
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23343951
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23344036
* https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23344797
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 86ce534ea18..f96ddc38af1 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -213,14 +213,14 @@ = f.number_field :max_artifacts_size, class: 'form-control' .help-block 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") + = link_to icon('question-circle'), 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' + = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'control-label col-sm-2' .col-sm-10 - = f.number_field :default_artifacts_expiration, class: 'form-control' + = f.text_field :default_artifacts_expire_in, 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") + Set the default expiration time for each job's artifacts + = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration') - if Gitlab.config.registry.enabled %fieldset |