Add latest changes from gitlab-org/gitlab@master

6 files changed, 41 insertions, 19 deletions

diff --git a/doc/administration/snippets/index.md b/doc/administration/snippets/index.md
index 9b485140070..6f165a8b0b0 100644
--- a/doc/administration/snippets/index.md
+++ b/doc/administration/snippets/index.md
@@ -11,8 +11,6 @@ Adjust the snippets' settings of your GitLab instance.
 
 ## Snippets content size limit
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31133) in GitLab 12.6.
-
 You can set a maximum content size limit for snippets. This limit can prevent
 abuse of the feature. The default value is **52428800 Bytes** (50 MB).
 
@@ -39,7 +37,7 @@ The steps to configure this setting through the Rails console are:
 1. Start the Rails console:
 
    ```shell
-   # For Omnibus installations
+   # For Linux package (Omnibus) installations
    sudo gitlab-rails console
 
    # For installations from source
@@ -64,13 +62,16 @@ To set the snippets size limit through the Application Settings API (similar to
 [updating any other setting](../../api/settings.md#change-application-settings)), use this command:
 
 ```shell
-curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings?snippet_size_limit=52428800"
+curl --request PUT \
+  --header "PRIVATE-TOKEN: <your_access_token>"
+  --url "https://gitlab.example.com/api/v4/application/settings?snippet_size_limit=52428800"
 ```
 
 You can also use the API to [retrieve the current value](../../api/settings.md#get-current-application-settings).
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/settings"
+curl --header "PRIVATE-TOKEN: <your_access_token>" \
+  --url "https://gitlab.example.com/api/v4/application/settings"
 ```
 
 ## Related topics
diff --git a/doc/api/merge_request_approvals.md b/doc/api/merge_request_approvals.md
index bb86ec54837..55581da64cc 100644
--- a/doc/api/merge_request_approvals.md
+++ b/doc/api/merge_request_approvals.md
@@ -315,8 +315,8 @@ Supported attributes:
 | `protected_branch_ids`              | Array             | **{dotted-circle}** No | The IDs of protected branches to scope the rule by. To identify the ID, [use the API](protected_branches.md#list-protected-branches).                                                                                           |
 | `report_type`                       | string            | **{dotted-circle}** No | The report type required when the rule type is `report_approver`. The supported report types are `license_scanning` [(Deprecated in GitLab 15.9)](../update/deprecations.md#license-check-and-the-policies-tab-on-the-license-compliance-page) and `code_coverage`.                                                                                        |
 | `rule_type`                         | string            | **{dotted-circle}** No | The type of rule. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` and `report_approver`.                                                                                                  |
-| `user_ids`                          | Array             | **{dotted-circle}** No | The IDs of users as approvers.                                                                                                                                                                                                  |
-| `usernames`                         | string array      | **{dotted-circle}** No | The usernames for this rule.                                                                                                                                                                                                    |
+| `user_ids`                          | Array             | **{dotted-circle}** No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, both lists of users are added. |
+| `usernames`                         | string array      | **{dotted-circle}** No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, both lists of users are added. |
 
 ```json
 {
@@ -444,8 +444,8 @@ Supported attributes:
 | `group_ids`                         | Array             | **{dotted-circle}** No | The IDs of groups as approvers.                                                                                                                                                                                                 |
 | `protected_branch_ids`              | Array             | **{dotted-circle}** No | The IDs of protected branches to scope the rule by. To identify the ID, [use the API](protected_branches.md#list-protected-branches).                                                                                           |
 | `remove_hidden_groups`              | boolean           | **{dotted-circle}** No | Whether hidden groups should be removed.                                                                                                                                                                                        |
-| `user_ids`                          | Array             | **{dotted-circle}** No | The IDs of users as approvers.                                                                                                                                                                                                  |
-| `usernames`                         | string array      | **{dotted-circle}** No | The usernames for this rule.                                                                                                                                                                                                    |
+| `user_ids`                          | Array             | **{dotted-circle}** No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, both lists of users are added. |
+| `usernames`                         | string array      | **{dotted-circle}** No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, both lists of users are added.|
 
 ```json
 {
@@ -859,8 +859,8 @@ Supported attributes:
 | `name`                     | string            | **{check-circle}** Yes | The name of the approval rule.                                               |
 | `approval_project_rule_id` | integer           | **{dotted-circle}** No | The ID of a project-level approval rule.                                     |
 | `group_ids`                | Array             | **{dotted-circle}** No | The IDs of groups as approvers.                                              |
-| `user_ids`                 | Array             | **{dotted-circle}** No | The IDs of users as approvers.                                               |
-| `usernames`                | string array      | **{dotted-circle}** No | The usernames for this rule.                                                 |
+| `user_ids`                 | Array             | **{dotted-circle}** No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, both lists of users are added.
+| `usernames`                | string array      | **{dotted-circle}** No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, both lists of users are added. |
 
 **Important:** When `approval_project_rule_id` is set, the `name`, `users` and
 `groups` of project-level rule are copied. The `approvals_required` specified
@@ -950,8 +950,8 @@ Supported attributes:
 | `group_ids`            | Array             | **{dotted-circle}** No | The IDs of groups as approvers.                                               |
 | `name`                 | string            | **{check-circle}**  No | The name of the approval rule.                                                |
 | `remove_hidden_groups` | boolean           | **{dotted-circle}** No | Whether hidden groups should be removed.                                      |
-| `user_ids`             | Array             | **{dotted-circle}** No | The IDs of users as approvers.                                                |
-| `usernames`            | string array      | **{dotted-circle}** No | The usernames for this rule.                                                  |
+| `user_ids`             | Array             | **{dotted-circle}** No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, both lists of users are added. |
+| `usernames`            | string array      | **{dotted-circle}** No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, both lists of users are added. |
 
 ```json
 {
diff --git a/doc/raketasks/x509_signatures.md b/doc/raketasks/x509_signatures.md
index 364264ae204..ab35f432fc2 100644
--- a/doc/raketasks/x509_signatures.md
+++ b/doc/raketasks/x509_signatures.md
@@ -6,8 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # X.509 signatures Rake task **(FREE SELF)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/122159) in GitLab 12.10.
-
 When [signing commits with X.509](../user/project/repository/x509_signed_commits/index.md),
 the trust anchor might change and the signatures stored within the database must be updated.
 
@@ -18,14 +16,18 @@ certificate store.
 
 To update all X.509 signatures, run:
 
-**Omnibus Installations:**
+::Tabs
+
+:::TabTitle Linux package (Omnibus)
 
 ```shell
 sudo gitlab-rake gitlab:x509:update_signatures
 ```
 
-**Source Installations:**
+:::TabTitle Self-compiled (source)
 
 ```shell
 sudo -u git -H bundle exec rake gitlab:x509:update_signatures RAILS_ENV=production
 ```
+
+::EndTabs
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 2a7b95304f7..89d7f04b549 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -354,6 +354,22 @@ Use `containerRegistrySizeIsEstimated` introduced in GitLab 16.2 instead.
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### GraphQL field `totalWeight` is deprecated
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.3</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/416219).
+</div>
+
+You can use GraphQL to query the total weight of issues in an issue board. However, the `totalWeight` field is limited to the maximum size 2147483647. As a result, `totalWeight` is deprecated and will be removed in GitLab 17.0.
+
+Use `totalIssueWeight` instead, introduced in GitLab 16.2.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### GraphQL type, `RunnerMembershipFilter` renamed to `CiRunnerMembershipFilter`
 
 <div class="deprecation-notes">
diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md
index dba7a507fef..35865bd60f6 100644
--- a/doc/user/group/value_stream_analytics/index.md
+++ b/doc/user/group/value_stream_analytics/index.md
@@ -143,6 +143,9 @@ Each pre-defined stages of value stream analytics is further described in the ta
 | Review    | The median time taken to review a merge request that has a closing issue pattern, between its creation and until it's merged. |
 | Staging   | The median time between merging a merge request that has a closing issue pattern until the very first deployment to a [production environment](#how-value-stream-analytics-identifies-the-production-environment). If there isn't a production environment, this is not tracked. |
 
+NOTE:
+Value stream analytics works on timestamp data and aggregates only the final start and stop events of the stage. For items that move back and forth between stages multiple times, the stage time is calculated solely from the final events' timestamps.
+
 For information about how value stream analytics calculates each stage, see the [Value stream analytics development guide](../../../development/value_stream_analytics.md).
 
 #### Example workflow
diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md
index 79599580f3e..9b0ab278cb2 100644
--- a/doc/user/project/merge_requests/changes.md
+++ b/doc/user/project/merge_requests/changes.md
@@ -23,9 +23,9 @@ To view the diff of changes included in a merge request:
 1. Go to your merge request.
 1. Below the merge request title, select **Changes**.
 1. If the merge request changes many files, you can jump directly to a specific file:
-   1. Select **Show file browser** (**{file-tree}**) to display the file tree.
+   1. Select **Show file browser** (**{file-tree}**) or press <kbd>F</kbd> to display the file tree.
    1. Select the file you want to view.
-   1. To hide the file browser, select **Show file browser** again.
+   1. To hide the file browser, select **Show file browser** or press <kbd>F</kbd> again.
 
 Files with many changes are collapsed to improve performance. GitLab displays the message:
 **Some changes are not shown**. To view the changes for that file, select **Expand file**.