Add latest changes from gitlab-org/gitlab@master

6 files changed, 22 insertions, 6 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 317cd05850d..857de2f7fb6 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -6027,7 +6027,7 @@ type Metadata {
 
 type MetricsDashboard {
   """
-  Annotations added to the dashboard. Will always return `null` if `metrics_dashboard_annotations` feature flag is disabled
+  Annotations added to the dashboard
   """
   annotations(
     """
@@ -8504,7 +8504,7 @@ input RemoveProjectFromSecurityDashboardInput {
   """
   ID of the project to remove from the Instance Security Dashboard
   """
-  projectId: ID!
+  id: ID!
 }
 
 """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 776dd968273..e51f44db2ff 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -16917,7 +16917,7 @@
           "fields": [
             {
               "name": "annotations",
-              "description": "Annotations added to the dashboard. Will always return `null` if `metrics_dashboard_annotations` feature flag is disabled",
+              "description": "Annotations added to the dashboard",
               "args": [
                 {
                   "name": "from",
@@ -24943,7 +24943,7 @@
           "fields": null,
           "inputFields": [
             {
-              "name": "projectId",
+              "name": "id",
               "description": "ID of the project to remove from the Instance Security Dashboard",
               "type": {
                 "kind": "NON_NULL",
diff --git a/doc/ci/examples/test-scala-application.md b/doc/ci/examples/test-scala-application.md
index 4da62c95a69..1831417e48e 100644
--- a/doc/ci/examples/test-scala-application.md
+++ b/doc/ci/examples/test-scala-application.md
@@ -14,7 +14,7 @@ The following `.gitlab-ci.yml` should be added in the root of your
 repository to trigger CI:
 
 ``` yaml
-image: java:8
+image: openjdk:8
 
 stages:
   - test
diff --git a/doc/user/application_security/security_dashboard/img/instance_security_dashboard_export_csv_v13_0.png b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_export_csv_v13_0.png
new file mode 100644
index 00000000000..d767c159e8d
--- /dev/null
+++ b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_export_csv_v13_0.png
diff --git a/doc/user/application_security/security_dashboard/img/project_security_dashboard_export_csv_v12.10.png b/doc/user/application_security/security_dashboard/img/project_security_dashboard_export_csv_v12_10.png
index 07b41b471d4..07b41b471d4 100644
--- a/doc/user/application_security/security_dashboard/img/project_security_dashboard_export_csv_v12.10.png
+++ b/doc/user/application_security/security_dashboard/img/project_security_dashboard_export_csv_v12_10.png
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index 59aeba9d655..8776b626bec 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -67,7 +67,7 @@ NOTE: **Note:**
 It may take several minutes for the download to start if your project consists
 of thousands of vulnerabilities. Do not close the page until the download finishes.
 
-![CSV Export Button](img/project_security_dashboard_export_csv_v12.10.png)
+![CSV Export Button](img/project_security_dashboard_export_csv_v12_10.png)
 
 ## Group Security Dashboard
 
@@ -152,6 +152,22 @@ projects.
 
 ![Instance Security Dashboard with projects](img/instance_security_dashboard_with_projects_v12_8.png)
 
+### Export vulnerabilities
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/213014) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
+
+You can export all your vulnerabilities as CSV by clicking the **{upload}** **Export**
+button located at top right of the **Instance Security Dashboard**. After the report
+is built, the CSV report downloads to your local machine. The report contains all
+vulnerabilities for the projects defined in the **Instance Security Dashboard**,
+as filters don't apply to the export function.
+
+NOTE: **Note:**
+It may take several minutes for the download to start if your project contains
+thousands of vulnerabilities. Do not close the page until the download finishes.
+
+![CSV Export Button](img/instance_security_dashboard_export_csv_v13_0.png)
+
 ## Keeping the dashboards up to date
 
 The Security Dashboard displays information from the results of the most recent