diff options
Diffstat (limited to 'app/views/help/instance_configuration')
3 files changed, 40 insertions, 29 deletions
diff --git a/app/views/help/instance_configuration/_gitlab_ci.html.haml b/app/views/help/instance_configuration/_gitlab_ci.html.haml deleted file mode 100644 index 53fa3f89873..00000000000 --- a/app/views/help/instance_configuration/_gitlab_ci.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -- content_for :table_content do - %li= link_to _('GitLab CI'), '#gitlab-ci' - -- content_for :settings_content do - %h2#gitlab-ci - = _('GitLab CI') - - %p - = _('Below are the current settings regarding') - = succeed('.') { link_to(_('GitLab CI'), 'https://about.gitlab.com/gitlab-ci', target: '_blank') } - - .table-responsive - %table - %thead - %tr - %th= _('Setting') - %th= instance_configuration_host(@instance_configuration.settings[:host]) - %th= _('Default') - %tbody - %tr - - artifacts_size = @instance_configuration.settings[:gitlab_ci][:artifacts_max_size] - %td= _('Artifacts maximum size') - %td= instance_configuration_human_size_cell(artifacts_size[:value]) - %td= instance_configuration_human_size_cell(artifacts_size[:default]) diff --git a/app/views/help/instance_configuration/_gitlab_pages.html.haml b/app/views/help/instance_configuration/_gitlab_pages.html.haml index 55f043214f6..51835c202d6 100644 --- a/app/views/help/instance_configuration/_gitlab_pages.html.haml +++ b/app/views/help/instance_configuration/_gitlab_pages.html.haml @@ -28,8 +28,3 @@ %td= _('Port') %td %code= instance_configuration_cell_html(gitlab_pages[:port]) - %br - - %p - - link_to_gitlab_ci = link_to(_('GitLab CI'), '#gitlab-ci') - = _("The maximum size of your Pages site is regulated by the artifacts maximum size which is part of %{link_to_gitlab_ci}.").html_safe % { link_to_gitlab_ci: link_to_gitlab_ci } diff --git a/app/views/help/instance_configuration/_size_limits.html.haml b/app/views/help/instance_configuration/_size_limits.html.haml new file mode 100644 index 00000000000..b592eeed020 --- /dev/null +++ b/app/views/help/instance_configuration/_size_limits.html.haml @@ -0,0 +1,40 @@ +- size_limits = @instance_configuration.settings[:size_limits] +- content_for :table_content do + - if size_limits.present? + %li= link_to _('Size Limits'), '#size-limits' + +- content_for :settings_content do + - if size_limits.present? + %h2#size-limits + = _('Size Limits') + + %p + = _('There are several size limits in place.') + .table-responsive + %table + %thead + %tr + %th= _('Setting') + %th= instance_configuration_host(@instance_configuration.settings[:host]) + %tbody + %tr + %td= _('Maximum attachment size') + %td= instance_configuration_human_size_cell(size_limits[:max_attachment_size]) + %tr + %td= _('Maximum push size') + %td= instance_configuration_human_size_cell(size_limits[:receive_max_input_size]) + %tr + %td= _('Maximum import size') + %td= instance_configuration_human_size_cell(size_limits[:max_import_size]) + %tr + %td= _('Maximum diff patch size') + %td= instance_configuration_human_size_cell(size_limits[:diff_max_patch_bytes]) + %tr + %td= _('Maximum job artifact size') + %td= instance_configuration_human_size_cell(size_limits[:max_artifacts_size]) + %tr + %td= _('Maximum page size') + %td= instance_configuration_human_size_cell(size_limits[:max_pages_size]) + %tr + %td= _('Maximum snippet size') + %td= instance_configuration_human_size_cell(size_limits[:snippet_size_limit]) |