summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-26 15:17:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-26 15:17:18 +0000
commit34283a71d9ac31eb4da0b59d0b25fc2be014bc9c (patch)
tree4a780bf8d9c57c3b8ce34fc81152d8a87f71d594 /app/views
parent9edf852c3a851d84b85bc94f7a3b41d5ef04dd32 (diff)
downloadgitlab-ce-34283a71d9ac31eb4da0b59d0b25fc2be014bc9c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/application_settings/_ci_cd.html.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index f162f5be746..0c9d5a5a8df 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -46,6 +46,11 @@
.form-group
= f.gitlab_ui_checkbox_component :protected_ci_variables, s_('AdminSettings|Protect CI/CD variables by default'), help_text: s_('AdminSettings|New CI/CD variables in projects and groups default to protected.')
.form-group
+ = f.label :ci_max_includes, s_('AdminSettings|Maximum includes'), class: 'label-bold'
+ = f.number_field :ci_max_includes, class: 'form-control gl-form-input'
+ .form-text.text-muted
+ = s_('AdminSettings|The maximum number of included files per pipeline.')
+ .form-group
= f.label :ci_config_path, _('Default CI/CD configuration file'), class: 'label-bold'
= f.text_field :default_ci_config_path, class: 'form-control gl-form-input', placeholder: '.gitlab-ci.yml'
%p.form-text.text-muted