diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-04 15:05:00 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-04 15:05:00 +0000 |
| commit | 4e457100cffe4128523c32ca073c8353fd9fa3d1 (patch) | |
| tree | bb59a7e0cbff4e270ede9040d8bf1a7ea382bd44 /app | |
| parent | 3ed6473352f3332d0e2ec9d65e777fdc3e4a06e3 (diff) | |
| parent | dfa8a6140daabf93be0a3f7703c541ddd573ef86 (diff) | |
| download | gitlab-ce-4e457100cffe4128523c32ca073c8353fd9fa3d1.tar.gz | |
Merge branch 'doc-artifacts-refactor' into 'master'
Refactor build artifacts documentation
## What does this MR do?
- Split user and admin documentation
- Use new location paths
- Add new Continuous Integration guide for the Admin area
- Link to new guide from the Admin area
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20612
See merge request !5662
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 23b52d08df7..23f864df147 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -228,6 +228,9 @@ = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'control-label col-sm-2' .col-sm-10 = f.number_field :max_artifacts_size, class: 'form-control' + .help-block + Set the maximum file size each build's artifacts can have + = link_to "(?)", help_page_path("user/admin_area/settings/continuous_integration", anchor: "maximum-artifacts-size") - if Gitlab.config.registry.enabled %fieldset @@ -385,4 +388,4 @@ .form-actions - = f.submit 'Save', class: 'btn btn-save'
\ No newline at end of file + = f.submit 'Save', class: 'btn btn-save' |