diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 18:09:16 +0000 |
| commit | 80e9fdc9682cfbcfb9202a2733605a6a6bd23f05 (patch) | |
| tree | 168375ea13d1a1f01d4cbcf6f0513fc9883e9477 /app/views/admin | |
| parent | 5372e109c0660e4670aa987568a51082beca1b3c (diff) | |
| download | gitlab-ce-80e9fdc9682cfbcfb9202a2733605a6a6bd23f05.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/integrations.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 14df0599583..2b01160a230 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -18,7 +18,7 @@ %p = s_('AdminSettings|Integrations configured here will automatically apply to all projects on this instance.') = link_to _('Learn more'), '#' - = render 'projects/services/integrations' + = render 'shared/integrations/integrations', integrations: @integrations - else = render_if_exists 'admin/application_settings/elasticsearch_form' |