Add latest changes from gitlab-org/gitlab@master

5 files changed, 31 insertions, 22 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 08ec55de6bc..08a041bacd7 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -3361,7 +3361,7 @@ input EpicTreeNodeFieldsInputType {
   """
   The id of the epic_issue or issue that the actual epic or issue is switched with
   """
-  adjacentReferenceId: ID!
+  adjacentReferenceId: ID
 
   """
   The id of the epic_issue or epic that is being moved
@@ -3376,7 +3376,7 @@ input EpicTreeNodeFieldsInputType {
   """
   The type of the switch, after or before allowed
   """
-  relativePosition: MoveType!
+  relativePosition: MoveType
 }
 
 """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 05098658f22..6aafce8ea76 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -9668,13 +9668,9 @@
               "name": "adjacentReferenceId",
               "description": "The id of the epic_issue or issue that the actual epic or issue is switched with",
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "ID",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
               },
               "defaultValue": null
             },
@@ -9682,13 +9678,9 @@
               "name": "relativePosition",
               "description": "The type of the switch, after or before allowed",
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "ENUM",
-                  "name": "MoveType",
-                  "ofType": null
-                }
+                "kind": "ENUM",
+                "name": "MoveType",
+                "ofType": null
               },
               "defaultValue": null
             },
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 67d84c47998..550e6e2b4d2 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -519,14 +519,11 @@ For details on saving and transporting Docker images as a file, see Docker's doc
      image: registry.example.com/namespace/dast:latest
      script:
         - export DAST_WEBSITE=${DAST_WEBSITE:-$(cat environment_url.txt)}
-        - /analyze -t $DAST_WEBSITE --auto-update-addons false -z"-silent"
+        - /analyze -t $DAST_WEBSITE --auto-update-addons false
    ```
 
 The option `--auto-update-addons false` instructs ZAP not to update add-ons.
 
-The option `-z` passes the quoted `-silent` parameter to ZAP. The `-silent` parameter ensures ZAP
-does not make any unsolicited requests including checking for updates.
-
 ## Reports
 
 The DAST job can emit various reports.
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index dadff8583db..fea6c2fe31a 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -209,7 +209,7 @@ Any code changes cause the approvals required to reset.
 
 An approval is required when a security report:
 
-- Contains a new vulnerability of `high`, `critical`, or `unknown` severity.
+- Contains a new vulnerability of `high`, `critical`, or `unknown` severity, regardless of dismissal.
 - Is not generated during pipeline execution.
 
 An approval is optional when a security report:
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index 773bd463d97..f039a21f195 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -203,7 +203,9 @@ have a [start or due date](#start-date-and-due-date), a
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9367) in GitLab 12.5.
 
-New issues and child epics are added to the top of their respective lists in the **Epics and Issues** tab. You can reorder the list of issues and the list of child epics. Issues and child epics cannot be intermingled.
+New issues and child epics are added to the top of their respective lists in the **Epics and Issues**
+tab. You can reorder the list of issues and the list of child epics. Issues and child epics cannot
+be intermingled.
 
 To reorder issues assigned to an epic:
 
@@ -215,6 +217,24 @@ To reorder child epics assigned to an epic:
 1. Go to the **Epics and Issues** tab.
 1. Drag and drop epics into the desired order.
 
+## Moving issues and child epics between epics
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33039) in GitLab 13.0.
+
+New issues and child epics are added to the top of their respective lists in the **Epics and Issues**
+tab. You can move issues and child epics from one epic to another. Issues and child epics cannot
+be intermingled.
+
+To move an issue to another epic:
+
+1. Go to the **Epics and Issues** tab.
+1. Drag and drop issues into the desired parent epic.
+
+To move child epics to another epic:
+
+1. Go to the **Epics and Issues** tab.
+1. Drag and drop epics into the desired parent epic.
+
 ## Updating epics
 
 ### Using bulk editing