Add latest changes from gitlab-org/gitlab@master

28 files changed, 484 insertions, 32 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 82344869fa1..92766ab68e4 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -210,6 +210,11 @@ type AlertManagementAlert implements Noteable {
   details: JSON
 
   """
+  The URL of the alert detail page
+  """
+  detailsUrl: String!
+
+  """
   All discussions on this noteable
   """
   discussions(
@@ -295,6 +300,11 @@ type AlertManagementAlert implements Noteable {
   ): NoteConnection!
 
   """
+  The alert condition for Prometheus
+  """
+  prometheusAlert: PrometheusAlert
+
+  """
   Runbook for the alert as defined in alert details
   """
   runbook: String
@@ -4419,6 +4429,11 @@ type Environment {
   id: ID!
 
   """
+  The most severe open alert for the environment. If multiple alerts have equal severity, the most recent is returned.
+  """
+  latestOpenedMostSevereAlert: AlertManagementAlert
+
+  """
   Metrics dashboard schema for the environment
   """
   metricsDashboard(
@@ -8241,6 +8256,31 @@ type MergeRequest implements Noteable {
   allowCollaboration: Boolean
 
   """
+  Users who approved the merge request
+  """
+  approvedBy(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): UserConnection
+
+  """
   Assignees of the merge request
   """
   assignees(
@@ -8271,6 +8311,11 @@ type MergeRequest implements Noteable {
   author: User
 
   """
+  Number of commits in the merge request
+  """
+  commitCount: Int
+
+  """
   Timestamp of when the merge request was created
   """
   createdAt: Time!
@@ -10250,6 +10295,11 @@ The connection type for Pipeline.
 """
 type PipelineConnection {
   """
+  Total count of collection
+  """
+  count: Int!
+
+  """
   A list of edges.
   """
   edges: [PipelineEdge]
@@ -10554,6 +10604,26 @@ type Project {
   descriptionHtml: String
 
   """
+  A single environment of the project
+  """
+  environment(
+    """
+    Name of the environment
+    """
+    name: String
+
+    """
+    Search query for environment name
+    """
+    search: String
+
+    """
+    States of environments that should be included in result
+    """
+    states: [String!]
+  ): Environment
+
+  """
   Environments of the project
   """
   environments(
@@ -12116,6 +12186,21 @@ type ProjectStatistics {
   wikiSize: Float
 }
 
+"""
+The alert condition for Prometheus
+"""
+type PrometheusAlert {
+  """
+  The human-readable text of the alert condition
+  """
+  humanizedText: String!
+
+  """
+  ID of the alert condition
+  """
+  id: ID!
+}
+
 type Query {
   """
   Get information about current user
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 0f13079f202..719d448b5f4 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -578,6 +578,24 @@
               "deprecationReason": null
             },
             {
+              "name": "detailsUrl",
+              "description": "The URL of the alert detail page",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "discussions",
               "description": "All discussions on this noteable",
               "args": [
@@ -802,6 +820,20 @@
               "deprecationReason": null
             },
             {
+              "name": "prometheusAlert",
+              "description": "The alert condition for Prometheus",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PrometheusAlert",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "runbook",
               "description": "Runbook for the alert as defined in alert details",
               "args": [
@@ -12339,6 +12371,20 @@
               "deprecationReason": null
             },
             {
+              "name": "latestOpenedMostSevereAlert",
+              "description": "The most severe open alert for the environment. If multiple alerts have equal severity, the most recent is returned.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "AlertManagementAlert",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "metricsDashboard",
               "description": "Metrics dashboard schema for the environment",
               "args": [
@@ -22903,6 +22949,59 @@
               "deprecationReason": null
             },
             {
+              "name": "approvedBy",
+              "description": "Users who approved the merge request",
+              "args": [
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "UserConnection",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "assignees",
               "description": "Assignees of the merge request",
               "args": [
@@ -22970,6 +23069,20 @@
               "deprecationReason": null
             },
             {
+              "name": "commitCount",
+              "description": "Number of commits in the merge request",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "createdAt",
               "description": "Timestamp of when the merge request was created",
               "args": [
@@ -30646,6 +30759,24 @@
           "description": "The connection type for Pipeline.",
           "fields": [
             {
+              "name": "count",
+              "description": "Total count of collection",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "edges",
               "description": "A list of edges.",
               "args": [
@@ -31458,6 +31589,57 @@
               "deprecationReason": null
             },
             {
+              "name": "environment",
+              "description": "A single environment of the project",
+              "args": [
+                {
+                  "name": "name",
+                  "description": "Name of the environment",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "search",
+                  "description": "Search query for environment name",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "states",
+                  "description": "States of environments that should be included in result",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Environment",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "environments",
               "description": "Environments of the project",
               "args": [
@@ -35657,6 +35839,55 @@
         },
         {
           "kind": "OBJECT",
+          "name": "PrometheusAlert",
+          "description": "The alert condition for Prometheus",
+          "fields": [
+            {
+              "name": "humanizedText",
+              "description": "The human-readable text of the alert condition",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "id",
+              "description": "ID of the alert condition",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
           "name": "Query",
           "description": null,
           "fields": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 932135d443d..cadcacb7f48 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -64,6 +64,7 @@ Describes an alert from the project's Alert Management
 | `createdAt` | Time | Timestamp the alert was created |
 | `description` | String | Description of the alert |
 | `details` | JSON | Alert details |
+| `detailsUrl` | String! | The URL of the alert detail page |
 | `endedAt` | Time | Timestamp the alert ended |
 | `eventCount` | Int | Number of events of this alert |
 | `hosts` | String! => Array | List of hosts the alert came from |
@@ -71,6 +72,7 @@ Describes an alert from the project's Alert Management
 | `issueIid` | ID | Internal ID of the GitLab issue attached to the alert |
 | `metricsDashboardUrl` | String | URL for metrics embed for the alert |
 | `monitoringTool` | String | Monitoring tool the alert came from |
+| `prometheusAlert` | PrometheusAlert | The alert condition for Prometheus |
 | `runbook` | String | Runbook for the alert as defined in alert details |
 | `service` | String | Service the alert came from |
 | `severity` | AlertManagementSeverity | Severity of the alert |
@@ -739,6 +741,7 @@ Describes where code is deployed for a project
 | Name  | Type  | Description |
 | ---   |  ---- | ----------  |
 | `id` | ID! | ID of the environment |
+| `latestOpenedMostSevereAlert` | AlertManagementAlert | The most severe open alert for the environment. If multiple alerts have equal severity, the most recent is returned. |
 | `metricsDashboard` | MetricsDashboard | Metrics dashboard schema for the environment |
 | `name` | String! | Human-readable name of the environment |
 | `state` | String! | State of the environment, for example: available/stopped |
@@ -1257,6 +1260,7 @@ Autogenerated return type of MarkAsSpamSnippet
 | ---   |  ---- | ----------  |
 | `allowCollaboration` | Boolean | Indicates if members of the target project can push to the fork |
 | `author` | User | User who created this merge request |
+| `commitCount` | Int | Number of commits in the merge request |
 | `createdAt` | Time! | Timestamp of when the merge request was created |
 | `defaultMergeCommitMessage` | String | Default merge commit message of the merge request |
 | `description` | String | Description of the merge request (Markdown rendered as HTML for caching) |
@@ -1602,6 +1606,7 @@ Information about pagination in a connection.
 | `createdAt` | Time | Timestamp of the project creation |
 | `description` | String | Short description of the project |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
+| `environment` | Environment | A single environment of the project |
 | `forksCount` | Int! | Number of times the project has been forked |
 | `fullPath` | ID! | Full path of the project |
 | `grafanaIntegration` | GrafanaIntegration | Grafana integration details for the project |
@@ -1732,6 +1737,15 @@ Represents a Project Member
 | `storageSize` | Float! | Storage size of the project |
 | `wikiSize` | Float | Wiki size of the project |
 
+## PrometheusAlert
+
+The alert condition for Prometheus
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `humanizedText` | String! | The human-readable text of the alert condition |
+| `id` | ID! | ID of the alert condition |
+
 ## Release
 
 Represents a release
diff --git a/doc/api/personal_access_tokens.md b/doc/api/personal_access_tokens.md
index 162ba88f727..517e26f3d85 100644
--- a/doc/api/personal_access_tokens.md
+++ b/doc/api/personal_access_tokens.md
@@ -4,7 +4,7 @@ You can read more about [personal access tokens](../user/profile/personal_access
 
 ## List personal access tokens
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22726) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.3.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227264) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.3.
 
 Get a list of personal access tokens.
 
@@ -60,3 +60,29 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
     }
 ]
 ```
+
+## Revoke a personal access token
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216004) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.3.
+
+Revoke a personal access token.
+
+```plaintext
+DELETE /personal_access_tokens/:id
+```
+
+| Attribute | Type    | required | Description         |
+|-----------|---------|----------|---------------------|
+| `id` | integer/string | yes | ID of personal access token |
+
+NOTE: **Note:**
+Non-administrators can revoke their own tokens. Administrators can revoke tokens of any user.
+
+```shell
+curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/personal_access_tokens/<personal_access_token_id>"
+```
+
+### Responses
+
+- `204: No Content` if successfully revoked.
+- `400 Bad Request` if not revoked successfully.
diff --git a/doc/api/vulnerabilities.md b/doc/api/vulnerabilities.md
index 70f29d961e3..a0d871af127 100644
--- a/doc/api/vulnerabilities.md
+++ b/doc/api/vulnerabilities.md
@@ -6,7 +6,7 @@ NOTE: **Note:**
 The former Vulnerabilities API was renamed to Vulnerability Findings API
 and its documentation was moved to [a different location](vulnerability_findings.md).
 This document now describes the new Vulnerabilities API that provides access to
-[Standalone Vulnerabilities](https://gitlab.com/groups/gitlab-org/-/epics/634).
+[Vulnerabilities](https://gitlab.com/groups/gitlab-org/-/epics/634).
 
 CAUTION: **Caution:**
 This API is in an alpha stage and considered unstable.
diff --git a/doc/api/vulnerability_findings.md b/doc/api/vulnerability_findings.md
index e21d903e474..96171f0229d 100644
--- a/doc/api/vulnerability_findings.md
+++ b/doc/api/vulnerability_findings.md
@@ -4,7 +4,7 @@
 
 NOTE: **Note:**
 This API resource is renamed from Vulnerabilities to Vulnerability Findings because the Vulnerabilities are reserved
-for serving the upcoming [Standalone Vulnerability objects](https://gitlab.com/gitlab-org/gitlab/-/issues/13561).
+for serving [Vulnerability objects](https://gitlab.com/gitlab-org/gitlab/-/issues/13561).
 To fix any broken integrations with the former Vulnerabilities API, change the `vulnerabilities` URL part to be
 `vulnerability_findings`.
 
diff --git a/doc/ci/parent_child_pipelines.md b/doc/ci/parent_child_pipelines.md
index a8ae49543a6..1cfa698bfa5 100644
--- a/doc/ci/parent_child_pipelines.md
+++ b/doc/ci/parent_child_pipelines.md
@@ -43,8 +43,8 @@ Child pipelines work well with other GitLab CI/CD features:
 - Since the parent pipeline in `.gitlab-ci.yml` and the child pipeline run as normal
   pipelines, they can have their own behaviors and sequencing in relation to triggers.
 
-All of this will work with the [`include:`](yaml/README.md#include) feature so you can compose
-the child pipeline configuration.
+See the [`trigger:`](yaml/README.md#trigger) keyword documentation for full details on how to
+include the child pipeline configuration.
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For an overview, see [Parent-Child Pipelines feature demo](https://youtu.be/n8KpBSqZNbk).
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 1c778788827..c252f6425d0 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -360,10 +360,10 @@ Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-d
 
 Avoid terms that reflect negative cultural stereotypes and history. In most cases, you can replace terms such as `master` and `slave` with terms that are more precise and functional, such as `primary` and `secondary`.
 
-| Use                   | Avoid                |
-|-----------------------|----------------------|
-| Primary / secondary   | Master / slave       |
-| Blacklist / whitelist | Allowlist / denylist |
+| Use                  | Avoid                 |
+|----------------------|-----------------------|
+| Primary / secondary  | Master / slave        |
+| Allowlist / denylist | Blacklist / whitelist |
 
 For more information see the following [Internet Draft specification](https://tools.ietf.org/html/draft-knodel-terminology-02).
 
diff --git a/doc/operations/incident_management/img/incident_list.png b/doc/operations/incident_management/img/incident_list.png
new file mode 100644
index 00000000000..0498fec6c9c
--- /dev/null
+++ b/doc/operations/incident_management/img/incident_list.png
diff --git a/doc/operations/incident_management/index.md b/doc/operations/incident_management/index.md
index 5db6c76a42b..a44d2cc0807 100644
--- a/doc/operations/incident_management/index.md
+++ b/doc/operations/incident_management/index.md
@@ -16,9 +16,7 @@ GitLab offers solutions for handling incidents in your applications and services
 such as [setting up Prometheus alerts](#configure-prometheus-alerts),
 [displaying metrics](#embed-metrics-in-incidents-and-issues), and sending notifications.
 While no configuration is required to use the [manual features](#create-an-incident-manually)
-of incident management, both automation and [configuration](#configure-incidents-ultimate)
-of incident management are only available in
-[GitLab Ultimate and GitLab.com Gold](https://about.gitlab.com/pricing/).
+of incident management, some simple [configuration](#configure-incidents) is needed to automate incident creation.
 
 For users with at least Developer [permissions](../../user/permissions.md), the
 Incident Management list is available at **Operations > Incidents**
@@ -328,7 +326,7 @@ You can be alerted via a Slack message when a new alert has been received.
 
 See the [Slack Notifications Service docs](../../user/project/integrations/slack.md) for information on how to set this up.
 
-## Configure incidents **(ULTIMATE)**
+## Configure incidents
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/4925) in GitLab Ultimate 11.11.
 
@@ -366,7 +364,23 @@ sends these emails to [owners and maintainers](../../user/permissions.md) of the
 These emails contain details of the alert, and a link for more information.
 
 To send separate email notifications to users with
-[Developer permissions](../../user/permissions.md), see [Configure incidents](#configure-incidents-ultimate).
+[Developer permissions](../../user/permissions.md), see [Configure incidents](#configure-incidents).
+
+## Incident List
+
+Incidents in GitLab are aggregated in the Incident List, available at
+**Operations > Incidents**. This list displays all incidents in GitLab, with tabs
+to display open incidents, closed incidents, and all incidents:
+
+![Incident list](img/incident_list.png)
+
+The list displays the following attributes:
+
+- **Incident title**
+- **Date created** - in 'time ago' format.
+- **Assignees** - the avatar of the user assigned to the incident.
+- **Published** - Displays a green check mark (**{check-circle}**) if the incident is published
+  to a [Status Page](status_page.md).
 
 ## Create an incident manually
 
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index 6b5cbab8399..2ed8de9396a 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -14,7 +14,6 @@ your team when environment performance falls outside of the boundaries you set.
 ## Managed Prometheus instances
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6590) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.2 for [custom metrics](index.md#adding-custom-metrics), and GitLab 11.3 for [library metrics](../../user/project/integrations/prometheus_library/metrics.md).
-> - Runbook URLs [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39315) in GitLab 13.3.
 
 For managed Prometheus instances using auto configuration, you can
 [configure alerts for metrics](index.md#adding-custom-metrics) directly in the
@@ -32,6 +31,18 @@ For managed Prometheus instances using auto configuration, you can
 
 To remove the alert, click back on the alert icon for the desired metric, and click **Delete**.
 
+### Link runbooks to alerts
+
+> - Runbook URLs [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39315) in GitLab 13.3.
+
+When creating alerts from the metrics dashboard for [managed Prometheus instances](#managed-prometheus-instances),
+you can also link a runbook. When the alert triggers, the
+[chart context menu](dashboards/index.md#chart-context-menu) on the metrics chart
+links to the runbook, making it easy for you to locate and access the correct runbook
+as soon as the alert fires:
+
+![Linked Runbook in charts](img/linked_runbooks_on_charts.png)
+
 ## External Prometheus instances
 
 >- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9258) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.8.
diff --git a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png
deleted file mode 100644
index 2d7cb923981..00000000000
--- a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_0.png
+++ /dev/null
diff --git a/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png
new file mode 100644
index 00000000000..1259917608b
--- /dev/null
+++ b/doc/operations/metrics/dashboards/img/panel_context_menu_v13_3.png
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index 11d2dc45008..ffcb7dc92c6 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -136,7 +136,7 @@ You can take action related to a chart's data by clicking the
 **{ellipsis_v}** **More actions** dropdown box above the upper right corner of
 any chart on a dashboard:
 
-![Context Menu](img/panel_context_menu_v13_0.png)
+![Context Menu](img/panel_context_menu_v13_3.png)
 
 The options are:
 
@@ -148,7 +148,10 @@ The options are:
   feature, logs narrow down to the selected time range. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/122013) in GitLab 12.8.)
 - **Download CSV** - Data from Prometheus charts on the metrics dashboard can be downloaded as CSV.
 - [Copy link to chart](../embed.md#embedding-gitlab-managed-kubernetes-metrics)
-- [Alerts](../alerts.md)
+- **Alerts** - Display any [alerts](../alerts.md) configured for this metric.
+- **View Runbook** - Displays the runbook for an alert. For information about configuring
+  runbooks, read [Set up alerts for Prometheus metrics](../alerts.md).
+  ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211844) in GitLab 13.3.)
 
 ### Timeline zoom and URL sharing
 
diff --git a/doc/operations/metrics/img/linked_runbooks_on_charts.png b/doc/operations/metrics/img/linked_runbooks_on_charts.png
new file mode 100644
index 00000000000..335ba5dc172
--- /dev/null
+++ b/doc/operations/metrics/img/linked_runbooks_on_charts.png
diff --git a/doc/user/application_security/security_dashboard/img/standalone_vulnerability_page_v13_1.png b/doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png
index 9cf95b197fe..9cf95b197fe 100644
--- a/doc/user/application_security/security_dashboard/img/standalone_vulnerability_page_v13_1.png
+++ b/doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index e4a3345d321..b8fcc513cb1 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -203,7 +203,7 @@ Clicking any vulnerability in the table takes you to its
 [Vulnerability Details](../vulnerabilities) page to see more information on that vulnerability.
 To create an issue associated with the vulnerability, click the **Create Issue** button.
 
-![Create an issue for the vulnerability](img/standalone_vulnerability_page_v13_1.png)
+![Create an issue for the vulnerability](img/vulnerability_page_v13_1.png)
 
 Once you create the issue, the vulnerability list contains a link to the issue and an icon whose
 color indicates the issue's status (green for open issues, blue for closed issues).
diff --git a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_download_patch_button_v13_1.png b/doc/user/application_security/vulnerabilities/img/vulnerability_page_download_patch_button_v13_1.png
index b925c342a11..b925c342a11 100644
--- a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_download_patch_button_v13_1.png
+++ b/doc/user/application_security/vulnerabilities/img/vulnerability_page_download_patch_button_v13_1.png
diff --git a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_merge_request_button_dropdown_v13_1.png b/doc/user/application_security/vulnerabilities/img/vulnerability_page_merge_request_button_dropdown_v13_1.png
index 05ca74c3d5c..05ca74c3d5c 100644
--- a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_merge_request_button_dropdown_v13_1.png
+++ b/doc/user/application_security/vulnerabilities/img/vulnerability_page_merge_request_button_dropdown_v13_1.png
diff --git a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_merge_request_button_v13_1.png b/doc/user/application_security/vulnerabilities/img/vulnerability_page_merge_request_button_v13_1.png
index a3034a7db04..a3034a7db04 100644
--- a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_merge_request_button_v13_1.png
+++ b/doc/user/application_security/vulnerabilities/img/vulnerability_page_merge_request_button_v13_1.png
diff --git a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_v13_1.png b/doc/user/application_security/vulnerabilities/img/vulnerability_page_v13_1.png
index 30a7195e1ab..30a7195e1ab 100644
--- a/doc/user/application_security/vulnerabilities/img/standalone_vulnerability_page_v13_1.png
+++ b/doc/user/application_security/vulnerabilities/img/vulnerability_page_v13_1.png
diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md
index d5cce6434d8..ffec4bf336d 100644
--- a/doc/user/application_security/vulnerabilities/index.md
+++ b/doc/user/application_security/vulnerabilities/index.md
@@ -5,16 +5,16 @@ group: Threat Insights
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 ---
 
-# Standalone Vulnerability pages
+# Vulnerability Pages
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13561) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
 
 Each security vulnerability in the [Security Dashboard](../security_dashboard/index.md#project-security-dashboard) has its own standalone
 page.
 
-![Standalone vulnerability page](img/standalone_vulnerability_page_v13_1.png)
+![Vulnerability page](img/vulnerability_page_v13_1.png)
 
-On the standalone vulnerability page, you can interact with the vulnerability in
+On the vulnerability page, you can interact with the vulnerability in
 several different ways:
 
 - [Change the Vulnerability Status](#changing-vulnerability-status) - You can change the
@@ -57,7 +57,7 @@ generates for you. GitLab supports the following scanners:
 
 When an automatic solution is available, the button in the header will show "Resolve with merge request":
 
-![Resolve with Merge Request button](img/standalone_vulnerability_page_merge_request_button_v13_1.png)
+![Resolve with Merge Request button](img/vulnerability_page_merge_request_button_v13_1.png)
 
 Selecting the button will create a merge request with the automatic solution.
 
@@ -66,8 +66,8 @@ Selecting the button will create a merge request with the automatic solution.
 To manually apply the patch that was generated by GitLab for a vulnerability, select the dropdown arrow on the "Resolve
 with merge request" button, then select the "Download patch to resolve" option:
 
-![Resolve with Merge Request button dropdown](img/standalone_vulnerability_page_merge_request_button_dropdown_v13_1.png)
+![Resolve with Merge Request button dropdown](img/vulnerability_page_merge_request_button_dropdown_v13_1.png)
 
 This will change the button text to "Download patch to resolve". Click on it to download the patch:
 
-![Download patch button](img/standalone_vulnerability_page_download_patch_button_v13_1.png)
+![Download patch button](img/vulnerability_page_download_patch_button_v13_1.png)
diff --git a/doc/user/group/saml_sso/group_managed_accounts.md b/doc/user/group/saml_sso/group_managed_accounts.md
index 08455dc4725..126970ebbb6 100644
--- a/doc/user/group/saml_sso/group_managed_accounts.md
+++ b/doc/user/group/saml_sso/group_managed_accounts.md
@@ -7,8 +7,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Group Managed Accounts **(PREMIUM)**
 
-CAUTION: **Warning:**
-This is a [Closed Beta](https://about.gitlab.com/handbook/product/#closed-beta) feature.
+CAUTION: **Caution:**
+This [Closed Beta](https://about.gitlab.com/handbook/product/#closed-beta) feature is being re-evaluated in favor of a different
+[identity model](https://gitlab.com/gitlab-org/gitlab/-/issues/218631) that does not require separate accounts.
+We recommend that group administrators who haven't yet implemented this feature wait for
+the new solution.
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/709) in GitLab 12.1.
 > - It's deployed behind a feature flag, disabled by default.
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index d8e8ab2fab7..800eb1d3359 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -1301,6 +1301,58 @@ X-Gitlab-Event: Job Hook
 
 Note that `commit.id` is the ID of the pipeline, not the ID of the commit.
 
+### Deployment events
+
+Triggered when deployment is finished/failed/canceled.
+
+**Request Header**:
+
+```plaintext
+X-Gitlab-Event: Deployment Hook
+```
+
+**Request Body**:
+
+```json
+{
+  "object_kind": "deployment",
+  "status": "success",
+  "deployable_id": 796,
+  "deployable_url": "http://10.126.0.2:3000/root/test-deployment-webhooks/-/jobs/796",
+  "environment": "staging",
+  "project": {
+    "id": 30,
+    "name": "test-deployment-webhooks",
+    "description": "",
+    "web_url": "http://10.126.0.2:3000/root/test-deployment-webhooks",
+    "avatar_url": null,
+    "git_ssh_url": "ssh://vlad@10.126.0.2:2222/root/test-deployment-webhooks.git",
+    "git_http_url": "http://10.126.0.2:3000/root/test-deployment-webhooks.git",
+    "namespace": "Administrator",
+    "visibility_level": 0,
+    "path_with_namespace": "root/test-deployment-webhooks",
+    "default_branch": "master",
+    "ci_config_path": "",
+    "homepage": "http://10.126.0.2:3000/root/test-deployment-webhooks",
+    "url": "ssh://vlad@10.126.0.2:2222/root/test-deployment-webhooks.git",
+    "ssh_url": "ssh://vlad@10.126.0.2:2222/root/test-deployment-webhooks.git",
+    "http_url": "http://10.126.0.2:3000/root/test-deployment-webhooks.git"
+  },
+  "short_sha": "279484c0",
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "avatar_url": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "email": "admin@example.com"
+  },
+  "user_url": "http://10.126.0.2:3000/root",
+  "commit_url": "http://10.126.0.2:3000/root/test-deployment-webhooks/-/commit/279484c09fbe69ededfced8c1bb6e6d24616b468",
+  "commit_title": "Add new file"
+}
+```
+
+Note that `deployable_id` is the ID of the CI job.
+
 ## Image URL rewriting
 
 From GitLab 11.2, simple image references are rewritten to use an absolute URL
diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md
index 4e7d460e7c7..371469a6ed6 100644
--- a/doc/user/project/issues/design_management.md
+++ b/doc/user/project/issues/design_management.md
@@ -206,13 +206,10 @@ viewed by browsing previous versions.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34382) in GitLab 13.3.
 
-You can change designs order with dragging design to the new position:
+You can change the order of designs by dragging them to a new position:
 
 ![Reorder designs](img/designs_reordering_v13_3.gif)
 
-NOTE: **Note:**
-You can reorder designs only on the latest version.
-
 ## Starting discussions on designs
 
 When a design is uploaded, you can start a discussion by clicking on
diff --git a/doc/user/project/merge_requests/fail_fast_testing.md b/doc/user/project/merge_requests/fail_fast_testing.md
index 619a6d04577..60f81159394 100644
--- a/doc/user/project/merge_requests/fail_fast_testing.md
+++ b/doc/user/project/merge_requests/fail_fast_testing.md
@@ -45,8 +45,9 @@ This template requires:
   - Use [Pipelines for Merge Requests](../../../ci/merge_request_pipelines/index.md#configuring-pipelines-for-merge-requests)
 - [Pipelines for Merged Results](../../../ci/merge_request_pipelines/pipelines_for_merged_results/index.md#enable-pipelines-for-merged-results)
   enabled in the project settings.
+- A Docker image with Ruby available. The template uses `image: ruby:2.6` by default, but you [can override](../../../ci/yaml/includes.md#overriding-external-template-values) this.
 
-## Configure Fast RSpec Failure
+## Configuring Fast RSpec Failure
 
 We'll use the following plain RSpec configuration as a starting point. It installs all the
 project gems and executes `rspec`, on merge request pipelines only.
@@ -69,6 +70,16 @@ include:
   - template: Verify/FailFast.gitlab-ci.yml
 ```
 
+To customize the job, specific options may be set to override the template. For example, to override the default Docker image:
+
+```yaml
+include:
+  - template: Verify/FailFast.gitlab-ci.yml
+
+rspec-rails-modified-path-specs:
+  image: custom-docker-image-with-ruby
+```
+
 ### Example test loads
 
 For illustrative purposes, let's say our Rails app spec suite consists of 100 specs per model for ten models.
diff --git a/doc/user/project/merge_requests/load_performance_testing.md b/doc/user/project/merge_requests/load_performance_testing.md
index 3239269109d..97f4f202ab3 100644
--- a/doc/user/project/merge_requests/load_performance_testing.md
+++ b/doc/user/project/merge_requests/load_performance_testing.md
@@ -141,7 +141,8 @@ For example, you can override the duration of the test with a CLI option:
 GitLab only displays the key performance metrics in the MR widget if k6's results are saved
 via [summary export](https://k6.io/docs/results-visualization/json#summary-export)
 as a [Load Performance report artifact](../../../ci/pipelines/job_artifacts.md#artifactsreportsload_performance-premium).
-The latest Load Performance artifact available is always used.
+The latest Load Performance artifact available is always used, using the
+summary values from the test.
 
 If [GitLab Pages](../pages/index.md) is enabled, you can view the report directly in your browser.
 
diff --git a/doc/user/project/merge_requests/test_coverage_visualization.md b/doc/user/project/merge_requests/test_coverage_visualization.md
index 793cedb0210..6751dde155c 100644
--- a/doc/user/project/merge_requests/test_coverage_visualization.md
+++ b/doc/user/project/merge_requests/test_coverage_visualization.md
@@ -54,6 +54,10 @@ from any job in any stage in the pipeline. The coverage will be displayed for ea
 Hovering over the coverage bar will provide further information, such as the number
 of times the line was checked by tests.
 
+NOTE: **Note:**
+The Cobertura XML parser currently does not support the `sources` element and ignores it. It is assumed that
+the `filename` of a `class` element contains the full path relative to the project root.
+
 ## Example test coverage configuration
 
 The following [`gitlab-ci.yml`](../../../ci/yaml/README.md) example uses [Mocha](https://mochajs.org/)