Add latest changes from gitlab-org/gitlab@master

doc/api/graphql/reference/gitlab_schema.graphql

@@ -7742,10 +7742,15 @@ input DismissVulnerabilityInput {
   clientMutationId: String
 
   """
-  Reason why vulnerability should be dismissed
+  Comment why vulnerability should be dismissed
   """
   comment: String
 
+  """
+  Reason why vulnerability should be dismissed
+  """
+  dismissalReason: VulnerabilityDismissalReason
+
   """
   ID of the vulnerability to be dismissed
   """
@@ -25997,10 +26002,15 @@ input VulnerabilityDismissInput {
   clientMutationId: String
 
   """
-  Reason why vulnerability should be dismissed
+  Comment why vulnerability should be dismissed
   """
   comment: String
 
+  """
+  Reason why vulnerability should be dismissed
+  """
+  dismissalReason: VulnerabilityDismissalReason
+
   """
   ID of the vulnerability to be dismissed
   """
@@ -26027,6 +26037,17 @@ type VulnerabilityDismissPayload {
   vulnerability: Vulnerability
 }
 
+"""
+The dismissal reason of the Vulnerability
+"""
+enum VulnerabilityDismissalReason {
+  ACCEPTABLE_RISK
+  FALSE_POSITIVE
+  MITIGATING_CONTROL
+  NOT_APPLICABLE
+  USED_IN_TESTS
+}
+
 """
 An edge in a connection.
 """

doc/api/graphql/reference/gitlab_schema.json

@@ -21435,7 +21435,7 @@
             },
             {
               "name": "comment",
-              "description": "Reason why vulnerability should be dismissed",
+              "description": "Comment why vulnerability should be dismissed",
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -21443,6 +21443,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "dismissalReason",
+              "description": "Reason why vulnerability should be dismissed",
+              "type": {
+                "kind": "ENUM",
+                "name": "VulnerabilityDismissalReason",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "clientMutationId",
               "description": "A unique identifier for the client performing the mutation.",
@@ -75380,7 +75390,7 @@
             },
             {
               "name": "comment",
-              "description": "Reason why vulnerability should be dismissed",
+              "description": "Comment why vulnerability should be dismissed",
               "type": {
                 "kind": "SCALAR",
                 "name": "String",
@@ -75388,6 +75398,16 @@
               },
               "defaultValue": null
             },
+            {
+              "name": "dismissalReason",
+              "description": "Reason why vulnerability should be dismissed",
+              "type": {
+                "kind": "ENUM",
+                "name": "VulnerabilityDismissalReason",
+                "ofType": null
+              },
+              "defaultValue": null
+            },
             {
               "name": "clientMutationId",
               "description": "A unique identifier for the client performing the mutation.",
@@ -75470,6 +75490,47 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "ENUM",
+          "name": "VulnerabilityDismissalReason",
+          "description": "The dismissal reason of the Vulnerability",
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "enumValues": [
+            {
+              "name": "ACCEPTABLE_RISK",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "FALSE_POSITIVE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "MITIGATING_CONTROL",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "USED_IN_TESTS",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "NOT_APPLICABLE",
+              "description": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "VulnerabilityEdge",

doc/api/graphql/reference/index.md

@@ -4935,6 +4935,18 @@ Possible states of a user.
 | `private` |  |
 | `public` |  |
 
+### VulnerabilityDismissalReason
+
+The dismissal reason of the Vulnerability.
+
+| Value | Description |
+| ----- | ----------- |
+| `ACCEPTABLE_RISK` |  |
+| `FALSE_POSITIVE` |  |
+| `MITIGATING_CONTROL` |  |
+| `NOT_APPLICABLE` |  |
+| `USED_IN_TESTS` |  |
+
 ### VulnerabilityExternalIssueLinkExternalTracker
 
 The external tracker of the external issue link related to a vulnerability.