Commit d73541d0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'application-settings-cleanup' into 'master'

Conditional partial rendering for EE in application settings

See merge request gitlab-org/gitlab-ce!21482
parents b5272bc2 6b6afa15
...@@ -325,6 +325,14 @@ ...@@ -325,6 +325,14 @@
.settings-content .settings-content
= render partial: 'repository_mirrors_form' = 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 = 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) } %section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment