diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-17 11:00:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-17 11:00:26 +0000 |
| commit | fb3307095634f0c20cf57e36f6772ae7560e94b7 (patch) | |
| tree | ac2cd0a48976d924c45b676cdf316af32541d077 /app | |
| parent | bd7febee01232050c93110a1883d40b3a4b31ff7 (diff) | |
| parent | d23aaa1afcf47ee19f47d535c727bc8a043c0508 (diff) | |
| download | gitlab-ce-fb3307095634f0c20cf57e36f6772ae7560e94b7.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/ci_cd.html.haml | 2 |
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 |