Add latest changes from gitlab-org/gitlab@master

7 files changed, 8 insertions, 19 deletions

diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index bc3edee908f..b6fc5cbe80f 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -135,6 +135,8 @@ The following metrics are available:
 | `gitlab_issuable_fast_count_by_state_total`                      | Counter     | 13.5    | Total number of row count operations on issue/merge request list pages                                                |                                                           |
 | `gitlab_issuable_fast_count_by_state_failures_total`             | Counter     | 13.5    | Number of soft-failed row count operations on issue/merge request list pages                                          |                                                           |
 | `gitlab_ci_trace_finalize_duration_seconds`                      | Histogram   | 13.6    | Duration of build trace chunks migration to object storage                                                            |                                                           |
+| `gitlab_vulnerability_report_branch_comparison_real_duration_seconds`  | Histogram   | 15.11    | Execution duration of vulnerability report present on default branch sql query                                                            |                                                           |
+| `gitlab_vulnerability_report_branch_comparison_cpu_duration_seconds`  | Histogram   | 15.11    | Execution duration of vulnerability report present on default branch sql query                                                            |                                                           |
 | `gitlab_external_http_total`                                     | Counter     | 13.8    | Total number of HTTP calls to external systems                                                                        | `controller`, `action`                                    |
 | `gitlab_external_http_duration_seconds`                          | Counter     | 13.8    | Duration in seconds spent on each HTTP call to external systems                                                       |                                                           |
 | `gitlab_external_http_exception_total`                           | Counter     | 13.8    | Total number of exceptions raised when making external HTTP calls                                                     |                                                           |
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 1fbe65d903e..2a0c64af57a 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -845,7 +845,8 @@ Use `detailed_merge_status` instead of `merge_status` to account for all potenti
 - The `detailed_merge_status` field can contain one of the following values related to the merge request:
   - `blocked_status`: Blocked by another merge request.
   - `broken_status`: Can't merge into the target branch due to a potential conflict.
-  - `checking`: Mergeability checks are still in progress.
+  - `checking`: Git is testing if a valid merge is possible.
+  - `unchecked`: Git has not yet tested if a valid merge is possible.
   - `ci_must_pass`: A CI/CD pipeline must succeed before merge.
   - `ci_still_running`: A CI/CD pipeline is still running.
   - `discussions_not_resolved`: All discussions must be resolved before merge.
@@ -855,7 +856,6 @@ Use `detailed_merge_status` instead of `merge_status` to account for all potenti
   - `not_approved`: Approval is required before merge.
   - `not_open`: The merge request must be open before merge.
   - `policies_denied`: The merge request contains denied policies.
-  - `unchecked`: The merge status has not been checked.
 
 ## Get single merge request participants
 
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index a7f53dae8b6..37f1f4cc65e 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -480,9 +480,8 @@ An [issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/297389) to add a
 
 When the **Enforce SSO-only authentication for web activity for this group** option is enabled:
 
-- In alignment with the table above, all members must access GitLab by using
-  their GitLab group’s single sign-on URL to
-  access group resources, regardless of whether they have an existing SAML
+- All users must access GitLab by using their GitLab group's single sign-on URL
+  to access group resources, regardless of whether they have an existing SAML
   identity.
 - SSO is enforced when users access groups and projects in the organization's
   group hierarchy. Users can view other groups and projects without SSO sign in.
diff --git a/doc/user/profile/img/profile-preferences-syntax-themes.png b/doc/user/profile/img/profile-preferences-syntax-themes.png
deleted file mode 100644
index 719df9410fc..00000000000
--- a/doc/user/profile/img/profile-preferences-syntax-themes.png
+++ /dev/null
diff --git a/doc/user/profile/img/profile-preferences-syntax-themes_v15_11.png b/doc/user/profile/img/profile-preferences-syntax-themes_v15_11.png
new file mode 100644
index 00000000000..39cd35f3b5b
--- /dev/null
+++ b/doc/user/profile/img/profile-preferences-syntax-themes_v15_11.png
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 318afd9d8a3..9988b4c2d9f 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -75,19 +75,7 @@ the respective libraries.
 Changing this setting allows you to customize the color theme when viewing any
 syntax highlighted code on GitLab.
 
-The default syntax theme is White, and you can choose among 5 different themes:
-
-<!-- vale gitlab.Spelling = NO -->
-
-- White
-- Dark
-- Solarized light
-- Solarized dark
-- Monokai
-
-<!-- vale gitlab.Spelling = YES -->
-
-![Profile preferences syntax highlighting themes](img/profile-preferences-syntax-themes.png)
+![Profile preferences syntax highlighting themes](img/profile-preferences-syntax-themes_v15_11.png)
 
 Introduced in GitLab 13.6, the themes [Solarized](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) and [Monokai](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) also apply to the [Web IDE](../project/web_ide/index.md) and [Snippets](../snippets.md).
 
diff --git a/doc/user/project/system_notes.md b/doc/user/project/system_notes.md
index 236f649460b..1eee4364d95 100644
--- a/doc/user/project/system_notes.md
+++ b/doc/user/project/system_notes.md
@@ -17,7 +17,7 @@ that occur during the life cycle of a GitLab object, such as:
 - [Tasks](../tasks.md).
 
 GitLab logs information about events triggered by Git or the GitLab application
-in system notes.
+in system notes. System notes use the format `<Author> <action> <time ago>`.
 
 ## Show or filter system notes