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

Conditional partial rendering for EE in application settings

See merge request gitlab-org/gitlab-ce!21482

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) }