Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 7 deletions

diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/index.js
index 1723642d36f..a7dc71ced1c 100644
--- a/app/assets/javascripts/jira_connect/index.js
+++ b/app/assets/javascripts/jira_connect/index.js
@@ -10,19 +10,20 @@ const initJiraFormHandlers = () => {
     AP.navigator.reload();
   };
 
-  const reqFailed = res => {
+  const reqFailed = (res, fallbackErrorMessage) => {
+    const { responseJSON: { error } = {} } = res || {};
     // eslint-disable-next-line no-alert
-    alert(res.responseJSON.error);
+    alert(error || fallbackErrorMessage);
   };
 
   AP.getLocation(location => {
-    $('.js-jira-connect-sign-in').each(() => {
+    $('.js-jira-connect-sign-in').each(function updateSignInLink() {
       const updatedLink = `${$(this).attr('href')}?return_to=${location}`;
       $(this).attr('href', updatedLink);
     });
   });
 
-  $('#add-subscription-form').on('submit', e => {
+  $('#add-subscription-form').on('submit', function onAddSubscriptionForm(e) {
     const actionUrl = $(this).attr('action');
     e.preventDefault();
 
@@ -34,11 +35,11 @@ const initJiraFormHandlers = () => {
         format: 'json',
       })
         .done(reqComplete)
-        .fail(reqFailed);
+        .fail(err => reqFailed(err, 'Failed to add namespace. Please try again.'));
     });
   });
 
-  $('.remove-subscription').on('click', e => {
+  $('.remove-subscription').on('click', function onRemoveSubscriptionClick(e) {
     const href = $(this).attr('href');
     e.preventDefault();
 
@@ -53,7 +54,7 @@ const initJiraFormHandlers = () => {
         },
       })
         .done(reqComplete)
-        .fail(reqFailed);
+        .fail(err => reqFailed(err, 'Failed to remove namespace. Please try again.'));
     });
   });
 };