Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 2 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index 4994b89875f..f74818ac87c 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -42,6 +42,7 @@ export default {
       v-if="adminState !== null"
       :inherit-from-id="adminState.id"
       :override="override"
+      :learn-more-path="propsSource.learnMorePath"
       @change="setOverride"
     />
     <active-checkbox v-if="propsSource.showActive" :key="`${currentKey}-active-checkbox`" />
diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
index accfc26974c..3c00cf84d1a 100644
--- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
+++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlNewDropdown, GlNewDropdownItem } from '@gitlab/ui';
+import { GlNewDropdown, GlNewDropdownItem, GlLink } from '@gitlab/ui';
 import { s__ } from '~/locale';
 
 const dropdownOptions = [
@@ -19,12 +19,18 @@ export default {
   components: {
     GlNewDropdown,
     GlNewDropdownItem,
+    GlLink,
   },
   props: {
     inheritFromId: {
       type: Number,
       required: true,
     },
+    learnMorePath: {
+      type: String,
+      required: false,
+      default: null,
+    },
     override: {
       type: Boolean,
       required: true,
@@ -48,7 +54,12 @@ 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|Default settings are inherited from the instance level.') }}</span>
+    <span
+      >{{ s__('Integrations|Default settings are inherited from the instance level.') }}
+      <gl-link v-if="learnMorePath" :href="learnMorePath" target="_blank">{{
+        __('Learn more')
+      }}</gl-link>
+    </span>
     <input name="service[inherit_from_id]" :value="override ? '' : inheritFromId" type="hidden" />
     <gl-new-dropdown :text="selected.text">
       <gl-new-dropdown-item
diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js
index 6a9f6fc16af..204cdad4a76 100644
--- a/app/assets/javascripts/integrations/edit/index.js
+++ b/app/assets/javascripts/integrations/edit/index.js
@@ -19,6 +19,7 @@ function parseDatasetToProps(data) {
     projectKey,
     upgradePlanPath,
     editProjectPath,
+    learnMorePath,
     triggerEvents,
     fields,
     inheritFromId,
@@ -51,6 +52,7 @@ function parseDatasetToProps(data) {
       upgradePlanPath,
       editProjectPath,
     },
+    learnMorePath,
     triggerEvents: JSON.parse(triggerEvents),
     fields: JSON.parse(fields),
     inheritFromId: parseInt(inheritFromId, 10),