diff options
Diffstat (limited to 'app/views/shared/integrations')
| -rw-r--r-- | app/views/shared/integrations/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/integrations/edit.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/integrations/overrides.html.haml | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/views/shared/integrations/_form.html.haml b/app/views/shared/integrations/_form.html.haml index 89c127408e1..e2457bc0632 100644 --- a/app/views/shared/integrations/_form.html.haml +++ b/app/views/shared/integrations/_form.html.haml @@ -1,4 +1,4 @@ - integration = local_assigns.fetch(:integration) -= form_for integration, as: :service, url: scoped_integration_path(integration, group: @group), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => scoped_test_integration_path(integration, group: @group) } } do |form| - = render 'shared/service_settings', form: form, integration: integration += form_for integration, as: :service, url: scoped_integration_path(integration, group: @group), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => scoped_test_integration_path(integration, group: @group), testid: 'integration-form' } } do |form| + = render 'shared/integration_settings', form: form, integration: integration diff --git a/app/views/shared/integrations/edit.html.haml b/app/views/shared/integrations/edit.html.haml index acb0c7ee52e..4ceaedc2a69 100644 --- a/app/views/shared/integrations/edit.html.haml +++ b/app/views/shared/integrations/edit.html.haml @@ -7,4 +7,7 @@ = @integration.title = render 'shared/integrations/tabs', integration: @integration, active_tab: 'edit' do - = render 'shared/integrations/form', integration: @integration + - if vue_integration_form_enabled? + = render 'shared/integration_settings', integration: @integration + - else + = render 'shared/integrations/form', integration: @integration diff --git a/app/views/shared/integrations/overrides.html.haml b/app/views/shared/integrations/overrides.html.haml index b8585fdef1f..4619675cfef 100644 --- a/app/views/shared/integrations/overrides.html.haml +++ b/app/views/shared/integrations/overrides.html.haml @@ -6,5 +6,4 @@ %h3.page-title = @integration.title -= render 'shared/integrations/tabs', integration: @integration, active_tab: 'overrides' do - .js-vue-integration-overrides{ data: integration_overrides_data(@integration) } +.js-vue-integration-overrides{ data: integration_overrides_data(@integration, project: @project, group: @group) } |