From 65688a509249eb3be8ea4687d3fe6d1432a47392 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Aug 2021 09:22:41 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/integration/jira/development_panel.md | 3 ++- .../jira/img/jira_dev_panel_jira_setup_3.png | Bin 37257 -> 80136 bytes doc/integration/jira/index.md | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'doc/integration') diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md index 9005ded8a0a..c8ea224f18e 100644 --- a/doc/integration/jira/development_panel.md +++ b/doc/integration/jira/development_panel.md @@ -37,7 +37,8 @@ After the integration is [set up on GitLab and Jira](#configure-the-integration) - Refer to any Jira issue by its ID (in uppercase) in GitLab branch names, commit messages, and merge request titles. -- See the linked branches, commits, and merge requests in Jira issues: +- See the linked branches, commits, and merge requests in Jira issues. +- Create GitLab branches from Jira issues ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66032) in GitLab 14.2). At this time, merge requests are called "pull requests" in Jira issues. This name may change in a future Jira release. diff --git a/doc/integration/jira/img/jira_dev_panel_jira_setup_3.png b/doc/integration/jira/img/jira_dev_panel_jira_setup_3.png index 4049a65f56b..c58f1d5cecc 100644 Binary files a/doc/integration/jira/img/jira_dev_panel_jira_setup_3.png and b/doc/integration/jira/img/jira_dev_panel_jira_setup_3.png differ diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md index 0be2cab6d76..ebc61b29c5b 100644 --- a/doc/integration/jira/index.md +++ b/doc/integration/jira/index.md @@ -49,13 +49,14 @@ To set up the Jira development panel integration: | Capability | Jira integration | Jira Development panel integration | |-|-|-| | Mention a Jira issue ID in a GitLab commit or merge request, and a link to the Jira issue is created. | Yes. | No. | -| Mention a Jira issue ID in GitLab and the Jira issue shows the GitLab issue or merge request. | Yes. A Jira comment with the GitLab issue or MR title links to GitLab. The first mention is also added to the Jira issue under **Web links**. | Yes, in the issue's Development panel. | -| Mention a Jira issue ID in a GitLab commit message and the Jira issue shows the commit message. | Yes. The entire commit message is displayed in the Jira issue as a comment and under **Web links**. Each message links back to the commit in GitLab. | Yes, in the issue's Development panel and optionally with a custom comment on the Jira issue using Jira [Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html). | +| Mention a Jira issue ID in GitLab and the Jira issue shows the GitLab issue or merge request. | Yes. A Jira comment with the GitLab issue or MR title links to GitLab. The first mention is also added to the Jira issue under **Web links**. | Yes, in the issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). | +| Mention a Jira issue ID in a GitLab commit message and the Jira issue shows the commit message. | Yes. The entire commit message is displayed in the Jira issue as a comment and under **Web links**. Each message links back to the commit in GitLab. | Yes, in the issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/) and optionally with a custom comment on the Jira issue using Jira [Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html). | | Mention a Jira issue ID in a GitLab branch name and the Jira issue shows the branch name. | No. | Yes, in the issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). | | Add Jira time tracking to an issue. | No. | Yes. Time can be specified using Jira Smart Commits. | | Use a Git commit or merge request to transition or close a Jira issue. | Yes. Only a single transition type, typically configured to close the issue by setting it to Done. | Yes. Transition to any state using Jira Smart Commits. | | Display a list of Jira issues. | Yes. **(PREMIUM)** | No. | | Create a Jira issue from a vulnerability or finding. | Yes. **(ULTIMATE)** | No. | +| Create a GitLab branch from a Jira issue. | No. | Yes, in the issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). | ## Authentication in Jira -- cgit v1.2.3