Merge branch '231404-instance-level-integrations-frontend-ux-updates' into 'master'

UX improvements for instance-level integrations

See merge request gitlab-org/gitlab!38674

app/assets/javascripts/integrations/edit/components/override_dropdown.vue

@@ -5,7 +5,7 @@ import { GlNewDropdown, GlNewDropdownItem } from '@gitlab/ui';
 const dropdownOptions = [
   {
     value: false,
-    text: s__('Integrations|Use instance level settings'),
+    text: s__('Integrations|Use default settings'),
   },
   {
     value: true,
@@ -48,7 +48,7 @@ export default {
   <div
     class="gl-display-flex gl-justify-content-space-between gl-align-items-baseline gl-py-4 gl-mt-5 gl-mb-6 gl-border-t-1 gl-border-t-solid gl-border-b-1 gl-border-b-solid gl-border-gray-100"
   >
-    <span>{{ s__('Integrations|This integration has multiple settings available.') }}</span>
+    <span>{{ s__('Integrations|Default settings are inherited from the instance level.') }}</span>
     <input name="service[inherit_from_id]" :value="override ? '' : inheritFromId" type="hidden" />
     <gl-new-dropdown :text="selected.text">
       <gl-new-dropdown-item

app/views/projects/services/_form.html.haml

@@ -3,7 +3,7 @@
 
 .row.gl-mt-3.gl-mb-3
   .col-lg-4
-    %h4.gl-mt-0
+    %h3.page-title.gl-mt-0
       = @service.title
       - [true, false].each do |value|
         - hide_class = 'd-none' if @service.operating? != value

app/views/shared/integrations/_form.html.haml

 - 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
-      = link_to _('Cancel'), scoped_integration_path(integration), class: 'btn btn-cancel'
+.row.gl-mt-3
+  .col-lg-4
+    %h3.page-title.gl-mt-0
+      = 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|
+      = 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'

locale/gitlab.pot

@@ -13102,6 +13102,9 @@ msgstr ""
 msgid "Integrations|Comment settings:"
 msgstr ""
 
+msgid "Integrations|Default settings are inherited from the instance level."
+msgstr ""
+
 msgid "Integrations|Enable comments"
 msgstr ""
 
@@ -13114,13 +13117,10 @@ msgstr ""
 msgid "Integrations|Standard"
 msgstr ""
 
-msgid "Integrations|This integration has multiple settings available."
-msgstr ""
-
 msgid "Integrations|Use custom settings"
 msgstr ""
 
-msgid "Integrations|Use instance level settings"
+msgid "Integrations|Use default settings"
 msgstr ""
 
 msgid "Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created."