Merge branch...

Merge branch '331684-vulnerabilities-linked-to-a-jira-issue-don-t-show-the-issue-s-status' into 'master'

Jira issue creation from Vulnerabilities: feature flag removal & issue status clarification

See merge request gitlab-org/gitlab!62958

doc/user/application_security/vulnerabilities/index.md

@@ -71,14 +71,7 @@ The issue is then opened so you can take further action.
 ### Create a Jira issue for a vulnerability
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4677) in GitLab 13.9.
-> - It's [deployed behind a feature flag](../../../user/feature_flags.md), enabled by default.
-> - It's enabled on GitLab.com.
-> - It's recommended for production use.
-> - For GitLab self-managed instances, GitLab administrators can opt to
->   [disable it](#enable-or-disable-jira-integration-for-vulnerabilities).
-
-WARNING:
-This feature might not be available to you. Check the **version history** note above for details.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/283850) in GitLab 13.12.
 
 Prerequisites:
 
@@ -95,24 +88,7 @@ To create a Jira issue for a vulnerability:
 The Jira issue is created and opened in a new browser tab. The **Summary** and **Description**
 fields are pre-populated from the vulnerability's details.
 
-### Enable or disable Jira integration for vulnerabilities **(ULTIMATE SELF)**
-
-The option to create a Jira issue for a vulnerability is under development but ready for production
-use. It is deployed behind a feature flag that is **enabled by default**.
-[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
-can opt to disable it.
-
-To enable it:
-
-```ruby
-Feature.enable(:jira_for_vulnerabilities)
-```
-
-To disable it:
-
-```ruby
-Feature.disable(:jira_for_vulnerabilities)
-```
+Unlike GitLab issues, the status of whether a Jira issue is open or closed does not display in the GitLab user interface.
 
 ## Linked issues
 
@@ -124,7 +100,7 @@ the issue that resolves or mitigates a vulnerability.
 
 Issues linked to a vulnerability are shown in the Vulnerability Report and the vulnerability's page.
 
-NOTE:
+Be aware of the following conditions between a vulnerability and a linked issue:
 
 - The vulnerability page shows related issues, but the issue page doesn't show the vulnerability it's related to.
 - An issue can only be related to one vulnerability at a time.

doc/user/application_security/vulnerability_report/index.md

@@ -128,10 +128,12 @@ To view the relevant file, select the filename in the vulnerability's details.
 ## View issues raised for a vulnerability
 
 The **Activity** column indicates the number of issues that have been created for the vulnerability.
-Hover over an **Activity** entry and select a link go to that issue.
+Hover over an **Activity** entry and select a link go to that issue. The status of whether the issue is open or closed also displays in the hover menu. 
 
 ![Display attached issues](img/vulnerability_list_table_v13_9.png)
 
+If Jira issue support is enabled, the issue link found in the Activity entry links out to the issue in Jira. Unlike GitLab issues, the status of whether a Jira issue is Open or Closed does not display in the GitLab UI. 
+
 ## Change status of vulnerabilities
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292636) in GitLab 13.10, all statuses became selectable.