From 8fd149139d3d64b102f51455180f03adbc80f469 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Sep 2021 12:10:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/integration/jira/connect-app.md | 2 +- doc/integration/jira/development_panel.md | 2 +- doc/integration/jira/index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/integration') diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md index 42ec2456c2d..7d32c080fff 100644 --- a/doc/integration/jira/connect-app.md +++ b/doc/integration/jira/connect-app.md @@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w NOTE: Only Jira users with administrator level access are able to install or configure -the GitLab app for Jira Cloud. +the GitLab.com for Jira Cloud app. ## GitLab.com for Jira Cloud app **(FREE SAAS)** diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md index c8ea224f18e..6bae672db71 100644 --- a/doc/integration/jira/development_panel.md +++ b/doc/integration/jira/development_panel.md @@ -69,7 +69,7 @@ To simplify administration, we recommend that a GitLab group maintainer or group | Jira usage | GitLab.com customers need | GitLab self-managed customers need | |------------|---------------------------|------------------------------------| -| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) application installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab and Jira. For more information, see the documentation for the [GitLab.com for Jira Cloud app](connect-app.md). | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab Jira Cloud application for self-managed instances](connect-app.md#install-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances) for more information. | +| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab.com and Jira. For more information, see the documentation for the [GitLab.com for Jira Cloud app](connect-app.md). | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab.com for Jira Cloud app for self-managed instances](connect-app.md#install-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances) for more information. | | Your own server | The [Jira DVCS (distributed version control system) connector](dvcs.md). This syncs data hourly. | The [Jira DVCS Connector](dvcs.md). | Each GitLab project can be configured to connect to an entire Jira instance. That means after diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md index 4ad9ab9f637..74dec70517c 100644 --- a/doc/integration/jira/index.md +++ b/doc/integration/jira/index.md @@ -40,7 +40,7 @@ displays in the [development panel](https://support.atlassian.com/jira-software- To set up the Jira development panel integration: - *If your installation uses Jira Cloud,* use the - [GitLab for Jira app](connect-app.md). + [GitLab.com for Jira Cloud app](connect-app.md). - *If either your Jira or GitLab installation is self-managed,* use the [Jira DVCS (distributed version control system) connector](dvcs.md). -- cgit v1.2.3