Add latest changes from gitlab-org/gitlab@master

18 files changed, 78 insertions, 23 deletions

diff --git a/doc/README.md b/doc/README.md
index 1cdb5bc7b47..c3db960514f 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -364,6 +364,7 @@ The following documentation relates to the DevOps **Secure** stage:
 | [Dependency Scanning](user/application_security/dependency_scanning/index.md) **(ULTIMATE)**          | Analyze your dependencies for known vulnerabilities.                   |
 | [Dynamic Application Security Testing (DAST)](user/application_security/dast/index.md) **(ULTIMATE)** | Analyze running web applications for known vulnerabilities.            |
 | [Group Security Dashboard](user/application_security/security_dashboard/index.md#group-security-dashboard) **(ULTIMATE)**      | View vulnerabilities in all the projects in a group and its subgroups. |
+| [Instance Security Dashboard](user/application_security/security_dashboard/index.md#instance-security-dashboard) **(ULTIMATE)**      | View vulnerabilities in all the projects you're interested in. |
 | [License Compliance](user/application_security/license_compliance/index.md) **(ULTIMATE)**            | Search your project's dependencies for their licenses.                 |
 | [Pipeline Security Dashboard](user/application_security/security_dashboard/index.md#pipeline-security-dashboard) **(ULTIMATE)**    | View the security reports for your project's pipelines.               |
 | [Project Security Dashboard](user/application_security/security_dashboard/index.md#project-security-dashboard) **(ULTIMATE)**    | View the latest security reports for your project.                     |
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index ccb4ccbd525..6388fe34135 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -80,6 +80,9 @@ From there, you can see the following actions:
 - Project was archived
 - Project was unarchived
 - Added/removed/updated protected branches
+- Release was added to a project
+- Release was updated
+- Release milestone associations changed
 
 ### Instance events **(PREMIUM ONLY)**
 
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index adb7a433303..f3da5a6dd2f 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -154,7 +154,7 @@ Some basic Ruby runtime metrics are available:
 | `ruby_sampler_duration_seconds`      | Counter   | 11.1  | Time spent collecting stats |
 | `ruby_process_cpu_seconds_total`     | Gauge     | 12.0  | Total amount of CPU time per process |
 | `ruby_process_max_fds`               | Gauge     | 12.0  | Maximum number of open file descriptors per process |
-| `ruby_process_resident_memory_bytes` | Gauge     | 12.0  | Memory usage by process, measured in bytes |
+| `ruby_process_resident_memory_bytes` | Gauge     | 12.0  | Memory usage by process |
 | `ruby_process_start_time_seconds`    | Gauge     | 12.0  | UNIX timestamp of process start time |
 
 [GC.stat]: https://ruby-doc.org/core-2.6.5/GC.html#method-c-stat
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index d592bcbbd27..345172658d2 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -5712,6 +5712,11 @@ type SentryDetailedError {
   frequency: [SentryErrorFrequency!]!
 
   """
+  GitLab commit SHA attributed to the Error based on the release version
+  """
+  gitlabCommit: String
+
+  """
   ID (global ID) of the error
   """
   id: ID!
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 0e4d91b99f2..2668ea98fc0 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -15549,6 +15549,20 @@
               "deprecationReason": null
             },
             {
+              "name": "gitlabCommit",
+              "description": "GitLab commit SHA attributed to the Error based on the release version",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "id",
               "description": "ID (global ID) of the error",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 7d8807bd8a2..9e053c9cdcb 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -893,6 +893,7 @@ Autogenerated return type of RemoveAwardEmoji
 | `lastReleaseLastCommit` | String | Commit the error was last seen |
 | `firstReleaseShortVersion` | String | Release version the error was first seen |
 | `lastReleaseShortVersion` | String | Release version the error was last seen |
+| `gitlabCommit` | String | GitLab commit SHA attributed to the Error based on the release version |
 
 ## SentryErrorFrequency
 
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 106c7714bfe..7c5730f9b07 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -210,7 +210,7 @@ For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/inde
 
 ## Supported web browsers
 
-We support the current and the previous major release of:
+GitLab supports the following web browsers:
 
 - Firefox
 - Chrome/Chromium
@@ -218,10 +218,11 @@ We support the current and the previous major release of:
 - Microsoft Edge
 - Internet Explorer 11
 
-The browser vendors release regular minor version updates with important bug fixes and security updates.
-Support is only provided for the current minor version of the major version you are running.
+For the listed web browsers, GitLab supports:
 
-Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version.
+- The current and previous major versions of browsers except Internet Explorer.
+- Only version 11 of Internet Explorer.
+- The current minor version of a supported major version.
 
 NOTE: **Note:** We do not support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
 in the future because we have features such as Issue Boards which require JavaScript extensively.
diff --git a/doc/user/application_security/security_dashboard/img/instance_security_dashboard_link_v12_4.png b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_link_v12_4.png
new file mode 100644
index 00000000000..e0e80810b08
--- /dev/null
+++ b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_link_v12_4.png
diff --git a/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v12_7.png b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v12_7.png
new file mode 100644
index 00000000000..ffd6b0bfae6
--- /dev/null
+++ b/doc/user/application_security/security_dashboard/img/instance_security_dashboard_with_projects_v12_7.png
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index bb2bf0b7806..e9ae87ab44e 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -26,7 +26,7 @@ The Security Dashboard supports the following reports:
 
 ## Requirements
 
-To use the group, project or pipeline security dashboard:
+To use the instance, group, project or pipeline security dashboard:
 
 1. At least one project inside a group must be configured with at least one of
    the [supported reports](#supported-reports).
@@ -110,6 +110,31 @@ vulnerabilities are not included either.
 
 Read more on how to [interact with the vulnerabilities](../index.md#interacting-with-the-vulnerabilities).
 
+## Instance Security Dashboard
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6953) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.7.
+
+At the instance level, the Security Dashboard displays the vulnerabilities
+present in all of the projects that you have added to it.
+
+You can access the Instance Security Dashboard from the menu
+bar at the top of the page. Under **More**, select **Security**.
+
+![Instance Security Dashboard navigation link](img/instance_security_dashboard_link_v12_4.png)
+
+### Adding projects to the dashboard
+
+To add projects to the dashboard:
+
+1. Click the **Edit dashboard** button on the Instance Security Dashboard page.
+1. Search for and add one or more projects using the **Search your projects** field.
+1. Click the **Add projects** button.
+
+Once added, the dashboard will display the vulnerabilities found in your chosen
+projects.
+
+![Instance Security Dashboard with projects](img/instance_security_dashboard_with_projects_v12_7.png)
+
 ## Keeping the dashboards up to date
 
 The Security Dashboard displays information from the results of the most recent
diff --git a/doc/user/discussions/img/apply_suggestion_v12_7.png b/doc/user/discussions/img/apply_suggestion_v12_7.png
new file mode 100644
index 00000000000..c8c44149fd0
--- /dev/null
+++ b/doc/user/discussions/img/apply_suggestion_v12_7.png
diff --git a/doc/user/discussions/img/insert_suggestion.png b/doc/user/discussions/img/insert_suggestion.png
deleted file mode 100644
index 4bf293b8297..00000000000
--- a/doc/user/discussions/img/insert_suggestion.png
+++ /dev/null
diff --git a/doc/user/discussions/img/make_suggestion.png b/doc/user/discussions/img/make_suggestion.png
deleted file mode 100644
index f407ea730fb..00000000000
--- a/doc/user/discussions/img/make_suggestion.png
+++ /dev/null
diff --git a/doc/user/discussions/img/make_suggestion_v12_7.png b/doc/user/discussions/img/make_suggestion_v12_7.png
new file mode 100644
index 00000000000..7eb84186b0a
--- /dev/null
+++ b/doc/user/discussions/img/make_suggestion_v12_7.png
diff --git a/doc/user/discussions/img/suggestion.png b/doc/user/discussions/img/suggestion.png
deleted file mode 100644
index 4167f3b2aac..00000000000
--- a/doc/user/discussions/img/suggestion.png
+++ /dev/null
diff --git a/doc/user/discussions/img/suggestion_button_v12_7.png b/doc/user/discussions/img/suggestion_button_v12_7.png
new file mode 100644
index 00000000000..3b7a4d625a3
--- /dev/null
+++ b/doc/user/discussions/img/suggestion_button_v12_7.png
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index 2eddd9e2ea3..56b4e940665 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -4,12 +4,12 @@ The ability to contribute conversationally is offered throughout GitLab.
 
 You can leave a comment in the following places:
 
-- issues
-- epics **(ULTIMATE)**
-- merge requests
-- snippets
-- commits
-- commit diffs
+- Issues
+- Epics **(ULTIMATE)**
+- Merge requests
+- Snippets
+- Commits
+- Commit diffs
 
 There are standard comments, and you also have the option to create a comment
 in the form of a thread. A comment can also be [turned into a thread](#start-a-thread-by-replying-to-a-standard-comment)
@@ -29,9 +29,7 @@ There is a limit of 5,000 comments for every object, for example: issue, epic, a
 
 ## Resolvable comments and threads
 
-> **Notes:**
->
-> - The main feature was [introduced][ce-5022] in GitLab 8.11.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/5022) in GitLab 8.11.
 > - Resolvable threads can be added only to merge request diffs.
 
 Thread resolution helps keep track of progress during planning or code review.
@@ -398,18 +396,21 @@ the Merge Request authored by the user that applied them.
 1. Choose a line of code to be changed, add a new comment, then click
    on the **Insert suggestion** icon in the toolbar:
 
-   ![Add a new comment](img/insert_suggestion.png)
+   ![Add a new comment](img/suggestion_button_v12_7.png)
 
 1. In the comment, add your suggestion to the pre-populated code block:
 
-   ![Add a suggestion into a code block tagged properly](img/make_suggestion.png)
+   ![Add a suggestion into a code block tagged properly](img/make_suggestion_v12_7.png)
 
 1. Click **Comment**.
 
+   NOTE: **Note:**
+   If you're using GitLab Premium, GitLab.com Silver, and higher tiers, the thread will display [Review](#merge-request-reviews-premium) options. Click either **Start a review**, **Add comment now**, or **Add to review** to obtain the same result.
+
    The suggestions in the comment can be applied by the merge request author
    directly from the merge request:
 
-   ![Apply suggestions](img/suggestion.png)
+   ![Apply suggestions](img/apply_suggestion_v12_7.png)
 
 Once the author applies a suggestion, it will be marked with the **Applied** label,
 the thread will be automatically resolved, and GitLab will create a new commit
@@ -464,7 +465,6 @@ to the original comment, so a note about when it was last edited will appear und
 This feature only exists for Issues, Merge requests, and Epics. Commits, Snippets and Merge request diff threads are
 not supported yet.
 
-[ce-5022]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/5022
 [ce-7125]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/7125
 [ce-7527]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/7527
 [ce-7180]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/7180
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index b5c4ad76fb9..cdb492c4db5 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -16,8 +16,12 @@ GitLab's **Releases** are a way to track deliverables in your project. Consider
 a snapshot in time of the source, build output, and other metadata or artifacts
 associated with a released version of your code.
 
-At the moment, you can create Release entries via the [Releases API](../../../api/releases/index.md);
-we recommend doing this as one of the last steps in your CI/CD release pipeline.
+There are several ways to create a Release:
+
+- In the interface, when you create a new Git tag.
+- In the interface, by adding a release note to an existing Git tag.
+- Using the [Releases API](../../../api/releases/index.md): we recommend doing this as one of the last
+  steps in your CI/CD release pipeline.
 
 ## Getting started with Releases
 
@@ -135,8 +139,9 @@ drag and drop files to it. Release notes are stored in GitLab's database.
 There are several ways to add release notes:
 
 - In the interface, when you create a new Git tag.
-- In the interface, by adding a note to an existing Git tag.
-- Using the GitLab API.
+- In the interface, by adding a release note to an existing Git tag.
+- Using the [Releases API](../../../api/releases/index.md): (we recommend doing this as one of the last
+  steps in your CI/CD release pipeline).
 
 To create a new tag, navigate to your project's **Repository > Tags** and
 click **New tag**. From there, you can fill the form with all the information