diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 09:10:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 09:10:12 +0300 |
| commit | c64b892786865a3b87701450c6ca62fcab0fa044 (patch) | |
| tree | 81193337273f6360b9d0814064454248cf0a7b6a /app/views/admin/application_settings/general.html.haml | |
| parent | d17008f99ed08e7c231b7e8e65cba1be51e2e747 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings/general.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/general.html.haml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml index 99526757a48..788dc0b0f1b 100644 --- a/app/views/admin/application_settings/general.html.haml +++ b/app/views/admin/application_settings/general.html.haml @@ -116,11 +116,10 @@ .settings-content #js-maintenance-mode-settings -- if Feature.enabled?(:instance_level_integrations) - = render_if_exists 'admin/application_settings/elasticsearch_form' - = render 'admin/application_settings/plantuml' - = render 'admin/application_settings/sourcegraph' - = render_if_exists 'admin/application_settings/slack' - = render 'admin/application_settings/third_party_offers' - = render 'admin/application_settings/snowplow' - = render 'admin/application_settings/eks' += render_if_exists 'admin/application_settings/elasticsearch_form' += render 'admin/application_settings/plantuml' += render 'admin/application_settings/sourcegraph' += render_if_exists 'admin/application_settings/slack' += render 'admin/application_settings/third_party_offers' += render 'admin/application_settings/snowplow' += render 'admin/application_settings/eks' |