Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 19 deletions

diff --git a/doc/ci/testing/code_quality.md b/doc/ci/testing/code_quality.md
index 367777960b5..62058e4f1cb 100644
--- a/doc/ci/testing/code_quality.md
+++ b/doc/ci/testing/code_quality.md
@@ -492,6 +492,23 @@ Example:
 ]
 ```
 
+## Integrate multiple tools
+
+Code Quality combines the results from all jobs in a pipeline into a single `gl-code-quality-report.json` file. As a result, multiple individual tools can be used in a pipeline, either alongside, or in place of, the supported `Code-Quality.gitlab-ci.yml` template.
+
+Here is an example that returns ESLint output in the necessary format:
+
+```yaml
+eslint:
+  image: node:18-alpine
+  script:
+    - npm ci
+    - npx eslint --format gitlab .
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
+```
+
 ## Using Analysis Plugins
 
 Code Quality functionality can be extended by using Code Climate
@@ -549,12 +566,9 @@ This can be due to multiple reasons:
 
 ### Only a single Code Quality report is displayed, but more are defined
 
-Starting [in GitLab 15.7](https://gitlab.com/gitlab-org/gitlab/-/issues/340525), Code Quality combines the results from all jobs in a pipeline.
-
-In previous versions, GitLab only uses the Code Quality artifact from the latest created job (with the largest job ID).
-If multiple jobs in a pipeline generate a code quality artifact, those of earlier jobs are ignored.
+Code Quality automatically [combines multiple reports](#integrate-multiple-tools).
 
-To avoid confusion, configure only one job to generate a `gl-code-quality-report.json` file.
+In GitLab 15.6 and earlier, Code Quality used only the artifact from the latest created job (with the largest job ID). Code Quality artifacts from earlier jobs were ignored.
 
 ### RuboCop errors
 
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index 5ce52414c42..dadae134f4c 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -201,8 +201,8 @@ This content is removed from the documentation as part of the Technical Writing
 ## Which versions are removed
 
 GitLab supports the current major version and two previous major versions.
-For example, if 15.0 is the current major version, all major and minor releases of
-GitLab 15.0, 14.0, and 13.0 are supported.
+For example, if 16.0 is the current major version, all major and minor releases of
+GitLab 16.0, 15.0, and 14.0 are supported.
 
 [View the list of supported versions](https://about.gitlab.com/support/statement-of-support/#version-support).
 
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 3b6c6105315..6216a1630b2 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -310,18 +310,6 @@ These shortcuts are available when viewing [epics](group/epics/index.md):
 | <kbd>e</kbd>      | Edit description. |
 | <kbd>l</kbd>      | Change label.     |
 
-## Metrics
-
-These shortcuts are available when using metrics:
-
-| Keyboard shortcut | Description         |
-|-------------------|---------------------|
-| <kbd>e</kbd>      | Expand panel.       |
-| <kbd>l</kbd>      | View logs.          |
-| <kbd>d</kbd>      | Download CSV.       |
-| <kbd>c</kbd>      | Copy link to chart. |
-| <kbd>a</kbd>      | Alerts.             |
-
 ## Disable keyboard shortcuts
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22113) in GitLab 12.8.