diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-14 18:06:07 +0300 |
commit | 429d1abad29d379d8bc8f5219eb72384ad485deb (patch) | |
tree | 5c8f9c96c203dbeb3e3e89f3979ce60453340f3f /app/views/projects/settings | |
parent | e464f195ff5debc3e9aad0f8c4537404b92019c6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r-- | app/views/projects/settings/ci_cd/_form.html.haml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 430d6071468..a674136e791 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -40,6 +40,15 @@ = _('If any job surpasses this timeout threshold, it will be marked as failed. Human readable time input language is accepted like "1 hour". Values without specification represent seconds.') = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'timeout'), target: '_blank' + - if can?(current_user, :update_max_artifacts_size, @project) + %hr + .form-group + = f.label :max_artifacts_size, _('Maximum artifacts size (MB)'), class: 'label-bold' + = f.number_field :max_artifacts_size, class: 'form-control' + %p.form-text.text-muted + = _("Set the maximum file size for each job's artifacts") + = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size-core-only'), target: '_blank' + %hr .form-group = f.label :ci_config_path, _('Custom CI config path'), class: 'label-bold' |