Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 0 deletions

diff --git a/app/views/shared/integrations/_form.html.haml b/app/views/shared/integrations/_form.html.haml
new file mode 100644
index 00000000000..0ddab1368c2
--- /dev/null
+++ b/app/views/shared/integrations/_form.html.haml
@@ -0,0 +1,14 @@
+- integration = local_assigns.fetch(:integration)
+
+%h3.page-title
+  = integration.title
+
+%p= integration.description
+
+= form_for integration, as: :service, url: scoped_integration_path(integration), method: :put, html: { class: 'gl-show-field-errors fieldset-form integration-settings-form js-integration-settings-form', data: { 'can-test' => integration.can_test?, '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(integration)
+      = link_to _('Cancel'), scoped_integration_path(integration), class: 'btn btn-cancel'
diff --git a/app/views/shared/integrations/edit.html.haml b/app/views/shared/integrations/edit.html.haml
new file mode 100644
index 00000000000..927d2410132
--- /dev/null
+++ b/app/views/shared/integrations/edit.html.haml
@@ -0,0 +1,5 @@
+- add_to_breadcrumbs _('Integrations'), scoped_integrations_path
+- breadcrumb_title @integration.title
+- page_title @integration.title, _('Integrations')
+
+= render 'shared/integrations/form', integration: @integration