summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hampton <shampton@gitlab.com>2019-06-13 13:41:27 -0700
committerScott Hampton <shampton@gitlab.com>2019-06-13 13:41:27 -0700
commitd23aaa1afcf47ee19f47d535c727bc8a043c0508 (patch)
treedb9f248d1838e55ffdcf1553b56e26c8a5f9c34f
parent4c27abb42f99d65a5611df825a3b35c7db0ecd1c (diff)
downloadgitlab-ce-8429-enforce-template-inclusion-in-pipelines-fe-backport.tar.gz
EE added a required template form on the CI/CD page. This is a backport for that change.
-rw-r--r--app/views/admin/application_settings/ci_cd.html.haml2
1 files changed, 2 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 db24c9982f7..a2aa1687f80 100644
--- a/app/views/admin/application_settings/ci_cd.html.haml
+++ b/app/views/admin/application_settings/ci_cd.html.haml
@@ -13,6 +13,8 @@
.settings-content
= render 'ci_cd'
+= render_if_exists 'admin/application_settings/required_instance_ci_setting', expanded: expanded_by_default?
+
- if Gitlab.config.registry.enabled
%section.settings.as-registry.no-animate#js-registry-settings{ class: ('expanded' if expanded_by_default?) }
.settings-header