Add latest changes from gitlab-org/gitlab@master

4 files changed, 36 insertions, 32 deletions

diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index be352e796f3..44e13f70f2e 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -7,6 +7,11 @@ type: reference, howto
 
 # Comments and threads **(FREE)**
 
+> - Paginated merge request discussions [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/340172) in GitLab 15.1 [with a flag](../../administration/feature_flags.md) named `paginated_mr_discussions`. Disabled by default.
+> - Paginated merge request discussions [enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/364497) in GitLab 15.2.
+> - Paginated merge request discussions [enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/364497) in GitLab 15.3.
+> - Paginated merge request discussions [generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/370075) in GitLab 15.8. Feature flag `paginated_mr_discussions` removed.
+
 GitLab encourages communication through comments, threads, and
 [code suggestions](../project/merge_requests/reviews/suggestions.md).
 
@@ -357,14 +362,3 @@ with a new push.
 
 Threads are now resolved if a push makes a diff section outdated.
 Threads on lines that don't change and top-level resolvable threads are not resolved.
-
-## Display paginated merge request discussions
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/340172) in GitLab 15.1 [with a flag](../../administration/feature_flags.md) named `paginated_mr_discussions`. Disabled by default.
-> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/364497) in GitLab 15.2.
-> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/364497) in GitLab 15.3.
-> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/370075) in GitLab 15.8. Feature flag `paginated_mr_discussions` removed.
-
-A merge request can have many discussions. Loading them all in a single request
-can be slow. To improve the performance of loading discussions, they are split into multiple
-pages, loading sequentially.
diff --git a/doc/user/packages/package_registry/supported_functionality.md b/doc/user/packages/package_registry/supported_functionality.md
index 3d92836ed82..e56ae88872a 100644
--- a/doc/user/packages/package_registry/supported_functionality.md
+++ b/doc/user/packages/package_registry/supported_functionality.md
@@ -124,3 +124,23 @@ The following authentication protocols are supported:
 | [Debian](../debian_repository/index.md)             | Basic auth               |
 | [Go](../go_proxy/index.md)                          | Basic auth               |
 | [Ruby gems](../rubygems_registry/index.md)          | Token                    |
+
+## Supported hash types **(FREE)**
+
+Hash values are used to ensure you are using the correct package. You can view these values in the user interface or with the [API](../../../api/packages.md).
+
+The Package Registry supports the following hash types:
+
+| Package type                                     | Supported hashes                 |
+|--------------------------------------------------|----------------------------------|
+| [Maven](../maven_repository/index.md)            | MD5, SHA1                        |
+| [npm](../npm_registry/index.md)                  | SHA1                             |
+| [NuGet](../nuget_repository/index.md)            | not applicable                   |
+| [PyPI](../pypi_repository/index.md)              | MD5, SHA256                      |
+| [Generic packages](../generic_packages/index.md) | SHA256                           |
+| [Composer](../composer_repository/index.md)      | not applicable                   |
+| [Conan](../conan_repository/index.md)            | MD5, SHA1                        |
+| [Helm](../helm_repository/index.md)              | not applicable                   |
+| [Debian](../debian_repository/index.md)          | MD5, SHA1, SHA256                |
+| [Go](../go_proxy/index.md)                       | MD5, SHA1, SHA256                |
+| [Ruby gems](../rubygems_registry/index.md)       | MD5, SHA1, SHA256 (gemspec only) |
diff --git a/doc/user/packages/package_registry/supported_hash_types.md b/doc/user/packages/package_registry/supported_hash_types.md
index 6d7dbf87468..d39b8d60c93 100644
--- a/doc/user/packages/package_registry/supported_hash_types.md
+++ b/doc/user/packages/package_registry/supported_hash_types.md
@@ -1,25 +1,11 @@
 ---
-stage: Package
-group: Package Registry
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: 'supported_functionality.md'
+remove_date: '2023-04-22'
 ---
 
-# Supported hash types **(FREE)**
+This document was moved to [another location](supported_functionality.md).
 
-Hash values are used to ensure you are using the correct package. You can view these values in the user interface or with the [API](../../../api/packages.md).
-
-The Package Registry supports the following hash types:
-
-| Package type                                     | Supported hashes                 |
-|--------------------------------------------------|----------------------------------|
-| [Maven](../maven_repository/index.md)            | MD5, SHA1                        |
-| [npm](../npm_registry/index.md)                  | SHA1                             |
-| [NuGet](../nuget_repository/index.md)            | not applicable                   |
-| [PyPI](../pypi_repository/index.md)              | MD5, SHA256                      |
-| [Generic packages](../generic_packages/index.md) | SHA256                           |
-| [Composer](../composer_repository/index.md)      | not applicable                   |
-| [Conan](../conan_repository/index.md)            | MD5, SHA1                        |
-| [Helm](../helm_repository/index.md)              | not applicable                   |
-| [Debian](../debian_repository/index.md)          | MD5, SHA1, SHA256                |
-| [Go](../go_proxy/index.md)                       | MD5, SHA1, SHA256                |
-| [Ruby gems](../rubygems_registry/index.md)       | MD5, SHA1, SHA256 (gemspec only) |
+<!-- This redirect file can be deleted after <2023-04-22>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/project/repository/git_history.md b/doc/user/project/repository/git_history.md
index 08fe767f9c9..321b9a5eb53 100644
--- a/doc/user/project/repository/git_history.md
+++ b/doc/user/project/repository/git_history.md
@@ -21,6 +21,10 @@ When you select **History**, this information is displayed:
 If you hover over a commit in the UI, the precise date and time of the commit modification
 are shown.
 
+The name and email information provided are retrieved from the
+[Git configuration](https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration)
+of the contributor when a commit is made.
+
 ## Associated `git` command
 
 If you're running `git` from the command line, the equivalent command