Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 3 deletions

diff --git a/app/assets/javascripts/jira_connect/components/app.vue b/app/assets/javascripts/jira_connect/components/app.vue
index 275a66d5956..e08918a6720 100644
--- a/app/assets/javascripts/jira_connect/components/app.vue
+++ b/app/assets/javascripts/jira_connect/components/app.vue
@@ -1,9 +1,13 @@
 <script>
 import { mapState } from 'vuex';
+import { GlAlert } from '@gitlab/ui';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   name: 'JiraConnectApp',
+  components: {
+    GlAlert,
+  },
   mixins: [glFeatureFlagsMixin()],
   computed: {
     ...mapState(['errorMessage']),
@@ -16,6 +20,12 @@ export default {
 
 <template>
   <div>
+    <gl-alert v-if="errorMessage" class="gl-mb-6" variant="danger" :dismissible="false">
+      {{ errorMessage }}
+    </gl-alert>
+
+    <h1>GitLab for Jira Configuration</h1>
+
     <div v-if="showNewUi">
       <h3 data-testid="new-jira-connect-ui-heading">{{ s__('Integrations|Linked namespaces') }}</h3>
     </div>
diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/index.js
index 05f13de6f53..0dbcb778a6c 100644
--- a/app/assets/javascripts/jira_connect/index.js
+++ b/app/assets/javascripts/jira_connect/index.js
@@ -23,11 +23,9 @@ const initJiraFormHandlers = () => {
   };
 
   const reqFailed = (res, fallbackErrorMessage) => {
-    const { responseJSON: { error = fallbackErrorMessage } = {} } = res || {};
+    const { error = fallbackErrorMessage } = res || {};
 
     store.commit(SET_ERROR_MESSAGE, error);
-    // eslint-disable-next-line no-alert
-    alert(error);
   };
 
   if (typeof AP.getLocation === 'function') {