diff options
Diffstat (limited to 'doc/integration/jira')
| -rw-r--r-- | doc/integration/jira/configure.md | 3 | ||||
| -rw-r--r-- | doc/integration/jira/connect-app.md | 2 | ||||
| -rw-r--r-- | doc/integration/jira/development_panel.md | 22 | ||||
| -rw-r--r-- | doc/integration/jira/index.md | 2 | ||||
| -rw-r--r-- | doc/integration/jira/issues.md | 2 |
5 files changed, 16 insertions, 15 deletions
diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md index 2033ddbad6f..bfeac230f89 100644 --- a/doc/integration/jira/configure.md +++ b/doc/integration/jira/configure.md @@ -22,7 +22,8 @@ Prerequisites: To configure your project: -1. Go to your project and select [**Settings > Integrations**](../../user/project/integrations/overview.md#accessing-integrations). +1. On the top bar, select **Menu > Projects** and find your project. +1. On the left sidebar, select **Settings > Integrations**. 1. Select **Jira**. 1. Select **Enable integration**. 1. Select **Trigger** actions. Your choice determines whether a mention of Jira issue diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md index 59cdba93543..5c8f78a94b1 100644 --- a/doc/integration/jira/connect-app.md +++ b/doc/integration/jira/connect-app.md @@ -94,7 +94,7 @@ from outside the Marketplace, which allows you to install the application: 1. Place your Jira instance into [development mode](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-2--enable-development-mode). 1. Sign in to your GitLab application as a user with administrator access. -1. Install the GitLab application from your self-managed GitLab instance, as +1. Install the GitLab application from your Jira instance, as described in the [Atlassian developer guides](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-3--install-and-test-your-app): 1. In your Jira instance, go to **Apps > Manage Apps** and select **Upload app**: diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md index 66810945d19..2f0ebea165a 100644 --- a/doc/integration/jira/development_panel.md +++ b/doc/integration/jira/development_panel.md @@ -4,25 +4,25 @@ group: Integrations info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments --- -# GitLab Jira Development panel integration **(FREE)** +# GitLab Jira development panel integration **(FREE)** > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/233149) from GitLab Premium to GitLab Free in 13.4. -With the Jira Development panel integration, you can reference Jira issues in GitLab. +With the Jira development panel integration, you can reference Jira issues in GitLab. When configured, activity (such as pipeline, deployment, and feature flags) displays in the Jira issue's -[Development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). -From the Development panel, you can open a detailed view and +[development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). +From the development panel, you can open a detailed view and [take various actions](#use-the-integration), including creating a new merge request from a branch:  -The information displayed in the Jira Development panel depends on where you mention the Jira issue ID: +The information displayed in the Jira development panel depends on where you mention the Jira issue ID: | Your mention of Jira issue ID in GitLab context | Automated effect in Jira issue | |---------------------------------------------------|--------------------------------------------------------------------------------------------------------| -| In a merge request title or description | Link to the MR is displayed in Development panel. | -| In a branch name | Link to the branch is displayed in Development panel. | -| In a commit message | Link to the commit is displayed in Development panel. | +| In a merge request title or description | Link to the MR is displayed in the development panel. | +| In a branch name | Link to the branch is displayed in the development panel. | +| In a commit message | Link to the commit is displayed in the development panel. | | In a commit message with Jira [Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html) | Displays your custom comment or logged time spent and/or performs specified issue transition on merge. | This integration connects all GitLab projects to projects in the Jira instance in either: @@ -61,8 +61,8 @@ an issue transition, or add a custom comment, read the Atlassian page ## Configure the integration <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> -For an overview of how to configure Jira Development panel integration, see -[Agile Management - GitLab Jira Development panel integration](https://www.youtube.com/watch?v=VjVTOmMl85M). +For an overview of how to configure the Jira development panel integration, see +[Agile Management - GitLab Jira development panel integration](https://www.youtube.com/watch?v=VjVTOmMl85M). To simplify administration, we recommend that a GitLab group maintainer or group owner (or, if possible, instance administrator in the case of self-managed GitLab) set up the integration. @@ -89,7 +89,7 @@ This integration is not supported on GitLab instances under a [relative URL](https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab). For example, `http://example.com/gitlab`. -## Troubleshoot the Development Panel +## Troubleshoot the development panel If you use Jira on your own server, go to the [Atlassian documentation](https://confluence.atlassian.com/jirakb/troubleshoot-the-development-panel-in-jira-server-574685212.html) for general troubleshooting information. diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md index 3052d85b2cb..371f3a4ab8e 100644 --- a/doc/integration/jira/index.md +++ b/doc/integration/jira/index.md @@ -56,7 +56,7 @@ or the Jira DVCS (distributed version control system) connector, ## Authentication in Jira The authentication method in Jira depends on whether you host Jira on your own server or on -[Atlassian cloud](https://www.atlassian.com/cloud): +[Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud): - **Jira Server** supports basic authentication. When connecting, a **username and password** are required. Connecting to Jira Server using the Central Authentication Service (CAS) is not possible. For more information, read diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md index e24862242e1..28998851697 100644 --- a/doc/integration/jira/issues.md +++ b/doc/integration/jira/issues.md @@ -106,7 +106,7 @@ sorts by **Created date** by default, with the newest issues listed at the top:  -- To display the most recently updated issues first, select **Last updated**. +- To display the most recently updated issues first, select **Updated date**. - You can [search and filter](#search-and-filter-the-issues-list) the issues list. - In GitLab [versions 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/299832), you can select an issue from the list to view it in GitLab: |