Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/jira_connect/subscriptions/constants.js b/app/assets/javascripts/jira_connect/subscriptions/constants.js
index 321d10205e6..05c315e7b8a 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/constants.js
+++ b/app/assets/javascripts/jira_connect/subscriptions/constants.js
@@ -24,7 +24,7 @@ export const I18N_ADD_SUBSCRIPTIONS_ERROR_MESSAGE = s__(
   'Integrations|Failed to link namespace. Please try again.',
 );
 export const I18N_UPDATE_INSTALLATION_ERROR_MESSAGE = s__(
-  'Integrations|Failed to update GitLab version. Please try again.',
+  'Integrations|Failed to update the GitLab instance. See the %{linkStart}troubleshooting documentation%{linkEnd}.',
 );
 export const I18N_OAUTH_APPLICATION_ID_ERROR_MESSAGE = s__(
   'Integrations|Failed to load Jira Connect Application ID. Please try again.',
@@ -40,6 +40,9 @@ export const INTEGRATIONS_DOC_LINK = helpPagePath('integration/jira/development_
 export const OAUTH_SELF_MANAGED_DOC_LINK = helpPagePath('integration/jira/connect-app', {
   anchor: 'connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances',
 });
+export const FAILED_TO_UPDATE_DOC_LINK = helpPagePath('integration/jira/connect-app', {
+  anchor: 'failed-to-update-the-gitlab-instance-for-self-managed-instances',
+});
 
 export const GITLAB_COM_BASE_PATH = 'https://gitlab.com';
 
diff --git a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue
index 8cc107930d1..d9ce272563b 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/pages/sign_in/sign_in_gitlab_multiversion/index.vue
@@ -8,6 +8,7 @@ import { updateInstallation, setApiBaseURL } from '~/jira_connect/subscriptions/
 import {
   GITLAB_COM_BASE_PATH,
   I18N_UPDATE_INSTALLATION_ERROR_MESSAGE,
+  FAILED_TO_UPDATE_DOC_LINK,
 } from '~/jira_connect/subscriptions/constants';
 import { SET_ALERT } from '~/jira_connect/subscriptions/store/mutation_types';
 
@@ -56,6 +57,7 @@ export default {
         .catch(() => {
           this.setAlert({
             message: I18N_UPDATE_INSTALLATION_ERROR_MESSAGE,
+            linkUrl: FAILED_TO_UPDATE_DOC_LINK,
             variant: 'danger',
           });
           this.loadingVersionSelect = false;