Add latest changes from gitlab-org/gitlab@master

5 files changed, 27 insertions, 2 deletions

diff --git a/data/deprecations/16-8-remove-deprecated-metric-filter-from-dora-api.yml b/data/deprecations/16-8-remove-deprecated-metric-filter-from-dora-api.yml
new file mode 100644
index 00000000000..75a49e9b175
--- /dev/null
+++ b/data/deprecations/16-8-remove-deprecated-metric-filter-from-dora-api.yml
@@ -0,0 +1,9 @@
+- title: "`metric` filter and `value` field for DORA API"
+  announcement_milestone: "16.8"  # (required) The milestone when this feature was first announced as deprecated.
+  removal_milestone: "17.0"  # (required) The milestone when this feature is planned to be removed
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: hsnir1  # (required) GitLab username of the person reporting the deprecation
+  stage: plan  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393172  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    Multiple DORA metrics can now be queried simultaneously using a new metrics field. The `metric` filter and `value` field for Graphql DORA API will be removed in GitLab 17.0.
diff --git a/doc/administration/geo/secondary_proxy/index.md b/doc/administration/geo/secondary_proxy/index.md
index 22bb7dd721d..195b112a0f3 100644
--- a/doc/administration/geo/secondary_proxy/index.md
+++ b/doc/administration/geo/secondary_proxy/index.md
@@ -164,11 +164,13 @@ In this context, accelerated reads refer to read requests served from the second
 | Pages                                               | **{dotted-circle}** No <sup>2</sup> |
 | Advanced search (using the web UI)                  | **{dotted-circle}** No |
 | Container registry                                  | **{dotted-circle}** No <sup>3</sup>|
+| Dependency Proxy                                    | **{dotted-circle}** No <sup>4</sup>|
 
 1. Git reads are served from the local secondary while pushes get proxied to the primary.
    Selective sync or cases where repositories don't exist locally on the Geo secondary throw a "not found" error.
 1. Pages can use the same URL (without access control), but must be configured separately and are not proxied.
 1. The container registry is only recommended for Disaster Recovery scenarios. If the secondary site's container registry is not up to date, the read request is served with old data as the request is not forwarded to the primary site.
+1. Read requests to a Geo secondary site's Dependency Proxy are always proxied to the primary site.
 
 ## Disable Geo proxying
 
diff --git a/doc/development/database/keyset_pagination.md b/doc/development/database/keyset_pagination.md
index 9bb44d2ed71..6b2c4f9d146 100644
--- a/doc/development/database/keyset_pagination.md
+++ b/doc/development/database/keyset_pagination.md
@@ -123,7 +123,7 @@ For the REST API, the `paginate_with_strategies` helper can be used on a relatio
 
 In order for keyset pagination to be used, the following conditions must be met:
 
-1. `params[:keyset]` must return `'keyset'`
+1. `params[:pagination]` must return `'keyset'`
 1. `params[:order_by]` and `params[:sort]` must both appear in the object returned by the
    `supported_keyset_orderings` class method on the model. In the following example, `Thing`
    supports keyset pagination when ordering by ID in either ascending or descending order.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index cba85b1acd9..e0c19a83439 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1259,6 +1259,20 @@ removed in 17.0.
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### `metric` filter and `value` field for DORA API
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.8</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/393172).
+</div>
+
+Multiple DORA metrics can now be queried simultaneously using a new metrics field. The `metric` filter and `value` field for Graphql DORA API will be removed in GitLab 17.0.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### `postgres_exporter['per_table_stats']` configuration setting
 
 <div class="deprecation-notes">
diff --git a/doc/user/application_security/policies/scan-execution-policies.md b/doc/user/application_security/policies/scan-execution-policies.md
index 1ac6162bd49..574d466cd53 100644
--- a/doc/user/application_security/policies/scan-execution-policies.md
+++ b/doc/user/application_security/policies/scan-execution-policies.md
@@ -241,7 +241,7 @@ Note the following:
 - A container scanning scan that is configured for the `pipeline` rule type ignores the agent defined in the `agents` object. The `agents` object is only considered for `schedule` rule types.
   An agent with a name provided in the `agents` object must be created and configured for the project.
 - Variables defined in a Scan Execution Policy follow the standard [CI/CD variable precedence](../../../ci/variables/index.md#cicd-variable-precedence).
-- `custom` scans are be executed for scheduled rules.
+- `custom` scans are not executed for scheduled rules.
 - Jobs variables and stages definitions from `custom` scans take precedence over the project's CI/CD configuration.
 
 ### `ci_configuration_path` object