Add latest changes from gitlab-org/gitlab@master

3 files changed, 24 insertions, 7 deletions

diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index 3773f83cca8..5eb51f67837 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -61,14 +61,14 @@ To configure your project settings in GitLab:
    - For **Jira issue regex**, [enter a regex pattern](issues.md#use-regular-expression).
    - For **Jira issue prefix**, [enter a prefix](issues.md#use-a-prefix).
 1. In the **Issues** section:
-   - To [view Jira issues](issues.md#view-jira-issues) in a GitLab project, select the **Enable Jira issues** checkbox and
+   - To [view Jira issues](issues.md#view-jira-issues) in GitLab, select the **Enable Jira issues** checkbox and
    enter a Jira project key. You can only view issues from a single Jira project in a GitLab project.
 
    WARNING:
    When you enable this setting, all users with access to that GitLab project
    can view all issues from the Jira project you've specified.
 
-   - To [create Jira issues for vulnerabilities](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability), select the **Enable Jira issue creation from vulnerabilities** checkbox.
+   - To [create Jira issues for vulnerabilities](#create-a-jira-issue-for-a-vulnerability), select the **Enable Jira issue creation from vulnerabilities** checkbox.
 
    NOTE:
    You can enable this setting at the project level only.
@@ -79,6 +79,27 @@ To configure your project settings in GitLab:
 Your GitLab project can now interact with all Jira projects in your instance, and the project
 displays a Jira link that opens the Jira project.
 
+## Create a Jira issue for a vulnerability **(ULTIMATE ALL)**
+
+Prerequisites:
+
+- Ensure the Jira issue integration is [configured](#configure-the-integration) and the
+  **Enable Jira issue creation from vulnerabilities** checkbox is selected.
+- You must have a Jira user account with permission to create issues in the target project.
+
+You can create a Jira issue to track any action taken to resolve or mitigate a vulnerability.
+
+To create a Jira issue for a vulnerability:
+
+1. On the left sidebar, select **Search or go to** and find your project.
+1. Select **Secure > Vulnerability report**.
+1. Select the vulnerability's description.
+1. Select **Create Jira issue**.
+
+A Jira issue is created in the project with information from the vulnerability report.
+
+To create a GitLab issue, see [Create a GitLab issue for a vulnerability](../../user/application_security/vulnerabilities/index.md#create-a-gitlab-issue-for-a-vulnerability).
+
 ## Create a Jira Cloud API token
 
 To configure the Jira issue integration for Jira Cloud, you must have a Jira Cloud API token.
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index a723ae2a249..5d417399af4 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -44,7 +44,7 @@ This table shows the capabilities available with the Jira issue integration and
 | Add time tracking to a Jira issue | **{dotted-circle}** No | **{check-circle}** Yes, time can be specified by using Jira Smart Commits |
 | Use a Git commit or merge request to transition or close a Jira issue |**{check-circle}** Yes, only a single transition type. Typically configured to close the issue by setting it to **Done** | **{check-circle}** Yes, transition to any state by using Jira Smart Commits |
 | [View a list of Jira issues](issues.md#view-jira-issues) | **{check-circle}** Yes | **{dotted-circle}** No |
-| [Create a Jira issue for a vulnerability](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability) | **{check-circle}** Yes | **{dotted-circle}** No |
+| [Create a Jira issue for a vulnerability](configure.md#create-a-jira-issue-for-a-vulnerability) | **{check-circle}** Yes | **{dotted-circle}** No |
 | Create a GitLab branch from a Jira issue | **{dotted-circle}** No | **{check-circle}** Yes, in the issue's development panel |
 | Sync GitLab deployments to Jira issues | **{dotted-circle}** No | **{check-circle}** Yes, in the issue's development panel. Mention a Jira issue ID in a GitLab merge request, branch name, or any of the last 5,000 commits made to the branch after the last successful deployment to the environment |
 
diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md
index f6716f49ea5..a8bff914dde 100644
--- a/doc/integration/jira/issues.md
+++ b/doc/integration/jira/issues.md
@@ -212,7 +212,3 @@ adding a comment to the Jira issue:
 
 1. Refer to the [Configure GitLab](configure.md) instructions.
 1. Clear the **Enable comments** checkbox.
-
-## Related topics
-
-- [Create a Jira issue for a vulnerability](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability)