Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 2 insertions, 7 deletions

diff --git a/app/views/shared/integrations/_form.html.haml b/app/views/shared/integrations/_form.html.haml
index 5826cb280bd..11e390a47e2 100644
--- a/app/views/shared/integrations/_form.html.haml
+++ b/app/views/shared/integrations/_form.html.haml
@@ -6,10 +6,5 @@
       = integration.title
 
   .col-lg-8
-    = form_for integration, as: :service, url: scoped_integration_path(integration), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'can-test' => integration.can_test?, 'test-url' => scoped_test_integration_path(integration) } } do |form|
+    = form_for integration, as: :service, url: scoped_integration_path(integration), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'test-url' => scoped_test_integration_path(integration) } } do |form|
       = render 'shared/service_settings', form: form, integration: integration
-
-      - if integration.editable?
-        .footer-block.row-content-block
-          = service_save_button
-          = link_to _('Cancel'), scoped_integration_path(integration), class: 'btn btn-cancel'
diff --git a/app/views/shared/integrations/_index.html.haml b/app/views/shared/integrations/_index.html.haml
index 2dbd612ea38..2f299ad5c89 100644
--- a/app/views/shared/integrations/_index.html.haml
+++ b/app/views/shared/integrations/_index.html.haml
@@ -3,7 +3,7 @@
     %col
     %col
     %col.d-none.d-sm-table-column
-    %col{ width: 130 }
+    %col{ width: 135 }
   %thead{ role: 'rowgroup' }
     %tr{ role: 'row' }
       %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 1 }