Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into 'master'

Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
2019-06-17 11:00:26 +00:00 · 2019-06-17 11:00:26 +00:00 · fb33070956
parent bd7febee01 d23aaa1afc
commit fb33070956
1 changed files with 2 additions and 0 deletions
--- 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