Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 11 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index 1e58b604bf7..d671ec33bcb 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -208,6 +208,17 @@ export default {
       data-testid="redirect-to-field"
     />
 
+    <div v-if="shouldUpgradeSlack" class="gl-mb-6">
+      <gl-alert
+        :dismissible="false"
+        :title="$options.slackUpgradeInfo.title"
+        :primary-button-link="customState.upgradeSlackUrl"
+        :primary-button-text="$options.slackUpgradeInfo.btnText"
+        class="gl-mb-5"
+        >{{ $options.slackUpgradeInfo.text }}</gl-alert
+      >
+    </div>
+
     <override-dropdown
       v-if="defaultState !== null"
       :inherit-from-id="defaultState.id"
@@ -241,17 +252,6 @@ export default {
       </div>
     </section>
 
-    <div v-if="shouldUpgradeSlack" class="gl-border-t">
-      <gl-alert
-        :dismissible="false"
-        :title="$options.slackUpgradeInfo.title"
-        :primary-button-link="customState.upgradeSlackUrl"
-        :primary-button-text="$options.slackUpgradeInfo.btnText"
-        class="gl-mb-8 gl-mt-5"
-        >{{ $options.slackUpgradeInfo.text }}</gl-alert
-      >
-    </div>
-
     <template v-if="hasSections">
       <integration-form-section
         v-for="(section, index) in customState.sections"