diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-04 18:52:49 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-04 18:52:49 +0300 |
| commit | d73541d006ce3d0261cf082dac5ae605dfe7a848 (patch) | |
| tree | eacd04b3cfd997c861d9ec2fbafed4c495ce2baf /app | |
| parent | b5272bc2b6469009a2243ad759c6792e3e2b9a15 (diff) | |
| parent | 6b6afa1546266178943339ec7746a14dec885b78 (diff) | |
Merge branch 'application-settings-cleanup' into 'master'
Conditional partial rendering for EE in application settings
See merge request gitlab-org/gitlab-ce!21482
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 6133a7646f4..194a8157013 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -325,6 +325,14 @@ .settings-content = render partial: 'repository_mirrors_form' += render_if_exists 'admin/application_settings/geo', expanded: expanded + += render_if_exists 'admin/application_settings/external_authorization_service_form', expanded: expanded + += render_if_exists 'admin/application_settings/elasticsearch_form', expanded: expanded + += render_if_exists 'admin/application_settings/slack', expanded: expanded + = render_if_exists 'admin/application_settings/templates', expanded: expanded %section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) } |