diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/views/shared/_service_settings.html.haml | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/views/shared/_service_settings.html.haml')
-rw-r--r-- | app/views/shared/_service_settings.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index c70fce7a38f..adacaeadfab 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -2,8 +2,8 @@ .service-settings - if @default_integration - .js-vue-default-integration-settings{ data: integration_form_data(@default_integration, group: @group) } - .js-vue-integration-settings{ data: integration_form_data(integration, group: @group) } + .js-vue-default-integration-settings{ data: integration_form_data(@default_integration, group: @group, project: @project) } + .js-vue-integration-settings{ data: integration_form_data(integration, group: @group, project: @project) } .js-integration-help-html.gl-display-none -# All content below will be repositioned in Vue - if lookup_context.template_exists?('help', "projects/services/#{integration.to_param}", true) |