Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 17 deletions

diff --git a/app/views/admin/integrations/_form.html.haml b/app/views/admin/integrations/_form.html.haml
deleted file mode 100644
index aa865c3b052..00000000000
--- a/app/views/admin/integrations/_form.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%h3.page-title
-  = @service.title
-
-%p= @service.description
-
-= form_for @service, as: :service, url: admin_application_settings_integration_path, method: :put, html: { class: 'gl-show-field-errors fieldset-form integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_admin_application_settings_integration_path(@service) } } do |form|
-  = render 'shared/service_settings', form: form, service: @service
-
-  - if @service.editable?
-    .footer-block.row-content-block
-      = service_save_button(@service)
-      = link_to _('Cancel'), admin_application_settings_integration_path, class: 'btn btn-cancel'
diff --git a/app/views/admin/integrations/edit.html.haml b/app/views/admin/integrations/edit.html.haml
deleted file mode 100644
index b19d00d7a16..00000000000
--- a/app/views/admin/integrations/edit.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- add_to_breadcrumbs _('Integrations'), integrations_admin_application_settings_path
-- breadcrumb_title @service.title
-- page_title @service.title, _('Integrations')
-
-= render 'form'