Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 1 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index 15f76c16516..4bf2b8d4468 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -1,5 +1,6 @@
 <script>
 import {
+  GlAlert,
   GlBadge,
   GlButton,
   GlModalDirective,
@@ -9,7 +10,7 @@ import {
 import axios from 'axios';
 import * as Sentry from '@sentry/browser';
 import { mapState, mapActions, mapGetters } from 'vuex';
-
+import { s__ } from '~/locale';
 import {
   I18N_FETCH_TEST_SETTINGS_DEFAULT_ERROR_MESSAGE,
   I18N_DEFAULT_ERROR_MESSAGE,
@@ -59,6 +60,7 @@ export default {
       import(
         /* webpackChunkName: 'integrationSectionTrigger' */ '~/integrations/edit/components/sections/trigger.vue'
       ),
+    GlAlert,
     GlBadge,
     GlButton,
     GlForm,
@@ -223,6 +225,12 @@ export default {
   csrf,
   integrationFormSectionComponents,
   billingPlanNames,
+  slackUpgradeInfo: {
+    title: s__(
+      `SlackIntegration|Notifications only work if you're on the latest version of the GitLab for Slack app`,
+    ),
+    btnText: s__('SlackIntegration|Update to the latest version'),
+  },
 };
 </script>
 
@@ -277,6 +285,15 @@ export default {
     </section>
 
     <template v-if="hasSections">
+      <div v-if="customState.shouldUpgradeSlack && isSlackIntegration" class="gl-border-t">
+        <gl-alert
+          :title="$options.slackUpgradeInfo.title"
+          variant="warning"
+          :primary-button-link="customState.upgradeSlackUrl"
+          :primary-button-text="$options.slackUpgradeInfo.btnText"
+          class="gl-mb-8 gl-mt-5"
+        />
+      </div>
       <div
         v-for="(section, index) in customState.sections"
         :key="section.type"
diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js
index 2360588ab39..f15ad5e052e 100644
--- a/app/assets/javascripts/integrations/edit/index.js
+++ b/app/assets/javascripts/integrations/edit/index.js
@@ -36,6 +36,7 @@ function parseDatasetToProps(data) {
     jiraIssueTransitionAutomatic,
     jiraIssueTransitionId,
     redirectTo,
+    upgradeSlackUrl,
     ...booleanAttributes
   } = data;
   const {
@@ -51,6 +52,7 @@ function parseDatasetToProps(data) {
     showJiraVulnerabilitiesIntegration,
     enableJiraIssues,
     enableJiraVulnerabilities,
+    shouldUpgradeSlack,
   } = parseBooleanInData(booleanAttributes);
 
   return {
@@ -89,6 +91,8 @@ function parseDatasetToProps(data) {
     integrationLevel,
     id: parseInt(id, 10),
     redirectTo,
+    shouldUpgradeSlack,
+    upgradeSlackUrl,
   };
 }