Add latest changes from gitlab-org/gitlab@master

5 files changed, 50 insertions, 4 deletions

diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md
index d159a83a178..95faafd073c 100644
--- a/doc/administration/geo/replication/datatypes.md
+++ b/doc/administration/geo/replication/datatypes.md
@@ -43,8 +43,8 @@ verification methods:
 | Blobs    | CI job artifacts _(object storage)_             | Geo with API/Managed (*2*)            | _Not implemented_      |
 | Blobs    | Archived CI build traces _(file system)_        | Geo with API                          | _Not implemented_      |
 | Blobs    | Archived CI build traces _(object storage)_     | Geo with API/Managed (*2*)            | _Not implemented_      |
-| Blobs    | Container registry _(file system)_              | Geo with API/Docker API               | _Not implemented_      |
-| Blobs    | Container registry _(object storage)_           | Geo with API/Managed/Docker API (*2*) | _Not implemented_      |
+| Blobs    | Container registry _(file system)_              | Geo with API/Docker API               | _SHA256 checksum_      |
+| Blobs    | Container registry _(object storage)_           | Geo with API/Managed/Docker API (*2*) | _SHA256 checksum_      |
 | Blobs    | Package registry _(file system)_                | Geo with API                          | SHA256 checksum        |
 | Blobs    | Package registry _(object storage)_             | Geo with API/Managed (*2*)            | _Not implemented_      |
 | Blobs    | Infrastructure registry _(file system)_         | Geo with API                          | SHA256 checksum        |
@@ -201,7 +201,7 @@ successfully, you must replicate their data using some other means.
 |[CI job artifacts](../../../ci/pipelines/job_artifacts.md)                                                     | **Yes** (10.4)                                                          | **Yes** (14.10)                                                            | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Verification is behind the feature flag `geo_job_artifact_replication`, enabled by default in 14.10. |
 |[CI Pipeline Artifacts](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/models/ci/pipeline_artifact.rb) | [**Yes** (13.11)](https://gitlab.com/gitlab-org/gitlab/-/issues/238464) | [**Yes** (13.11)](https://gitlab.com/gitlab-org/gitlab/-/issues/238464)    | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Persists additional artifacts after a pipeline completes. |
 |[CI Secure Files](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/models/ci/secure_file.rb) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [No](object_storage.md#verification-of-files-in-object-storage) | Verification is behind the feature flag `geo_ci_secure_file_replication`, enabled by default in 15.3. |
-|[Container Registry](../../packages/container_registry.md)                                                     | **Yes** (12.3)*                                                         | No                                                                         | No                                                             | No                                                              | See [instructions](container_registry.md) to set up the Container Registry replication. |
+|[Container Registry](../../packages/container_registry.md)                                                     | **Yes** (12.3)*                                                         | **Yes** (15.10)                                                                         | **Yes** (12.3)*                                                             | **Yes** (15.10)                                                              | See [instructions](container_registry.md) to set up the Container Registry replication. |
 |[Infrastructure Registry](../../../user/packages/infrastructure_registry/index.md)                             | **Yes** (14.0)                                                          | **Yes** (14.0)                                                             | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. |
 |[Project designs repository](../../../user/project/issues/design_management.md)                                | **Yes** (12.7)                                                          | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/32467)                  | N/A                                                                 | N/A                                                             | Designs also require replication of LFS objects and Uploads. |
 |[Package Registry](../../../user/packages/package_registry/index.md)                                           | **Yes** (13.2)                                                          | **Yes** (13.10)                                                            | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. |
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 0463ad4ab98..a6b25acec5d 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -323,6 +323,12 @@ configuration option in `gitlab.yml`. These metrics are served from the
 | `geo_container_repositories_synced`    | Gauge   | 15.4  | Number of container repositories synced on secondary | `url` |
 | `geo_container_repositories_failed`    | Gauge   | 15.4  | Number of syncable container repositories failed to sync on secondary | `url` |
 | `geo_container_repositories_registry`  | Gauge   | 15.4  | Number of container repositories in the registry | `url` |
+| `geo_container_repositories_checksum_total`           | Gauge   | 15.10  | Number of container repositories checksummed successfully on primary | `url` |
+| `geo_container_repositories_checksummed`    | Gauge   | 15.10  | Number of container repositories tried to checksum on primary | `url` |
+| `geo_container_repositories_checksum_failed`    | Gauge   | 15.10  | Number of container repositories failed to calculate the checksum on primary | `url` |
+| `geo_container_repositories_verification_total`  | Gauge   | 15.10  | Number of container repositories' verifications tried on secondary | `url` |
+| `geo_container_repositories_verified`    | Gauge   | 15.10  | Number of container repositories verified on secondary | `url` |
+| `geo_container_repositories_verification_failed`    | Gauge   | 15.10  | Number of container repositories' failed verifications on secondary | `url` |
 | `geo_ci_secure_files`                            | Gauge   | 15.3  | Number of secure files on primary | `url` |
 | `geo_ci_secure_files_checksum_total`             | Gauge   | 15.3  | Number of secure files to checksum on primary | `url` |
 | `geo_ci_secure_files_checksummed`                | Gauge   | 15.3  | Number of secure files that successfully calculated the checksum on primary | `url` |
diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md
index 0b0dd543503..ed413c358de 100644
--- a/doc/api/geo_nodes.md
+++ b/doc/api/geo_nodes.md
@@ -520,6 +520,13 @@ Example response:
     "container_repositories_registry_count": 5,
     "container_repositories_synced_in_percentage": "100.00%",
     "container_repositories_synced_missing_on_primary_count": 0,
+    "container_repositories_checksum_total_count": 0,
+    "container_repositories_checksummed_count": 0,
+    "container_repositories_checksum_failed_count": 0,
+    "container_repositories_verification_total_count": 0,
+    "container_repositories_verified_count": 0,
+    "container_repositories_verification_failed_count": 0,
+    "container_repositories_verified_in_percentage": "100.00%",
     "dependency_proxy_manifests_count": 5,
     "dependency_proxy_manifests_checksum_total_count": 5,
     "dependency_proxy_manifests_checksummed_count": 5,
@@ -716,6 +723,13 @@ Example response:
     "container_repositories_registry_count": 5,
     "container_repositories_synced_in_percentage": "100.00%",
     "container_repositories_synced_missing_on_primary_count": 0,
+    "container_repositories_checksum_total_count": 0,
+    "container_repositories_checksummed_count": 0,
+    "container_repositories_checksum_failed_count": 0,
+    "container_repositories_verification_total_count": 0,
+    "container_repositories_verified_count": 0,
+    "container_repositories_verification_failed_count": 0,
+    "container_repositories_verified_in_percentage": "100.00%",
     "dependency_proxy_manifests_count": 5,
     "dependency_proxy_manifests_checksum_total_count": 5,
     "dependency_proxy_manifests_checksummed_count": 5,
@@ -922,6 +936,13 @@ Example response:
   "container_repositories_registry_count": 5,
   "container_repositories_synced_in_percentage": "100.00%",
   "container_repositories_synced_missing_on_primary_count": 0,
+  "container_repositories_checksum_total_count": 0,
+  "container_repositories_checksummed_count": 0,
+  "container_repositories_checksum_failed_count": 0,
+  "container_repositories_verification_total_count": 0,
+  "container_repositories_verified_count": 0,
+  "container_repositories_verification_failed_count": 0,
+  "container_repositories_verified_in_percentage": "100.00%",
   "dependency_proxy_manifests_count": 5,
   "dependency_proxy_manifests_checksum_total_count": 5,
   "dependency_proxy_manifests_checksummed_count": 5,
diff --git a/doc/development/go_guide/index.md b/doc/development/go_guide/index.md
index 61c5abe903d..b1e37ddbde8 100644
--- a/doc/development/go_guide/index.md
+++ b/doc/development/go_guide/index.md
@@ -472,7 +472,7 @@ for _, val := range s1 {
 **Do:**
 
 ```golang
-s2 := make([]string, 0, size)
+s2 := make([]string, 0, len(s1))
 for _, val := range s1 {
     s2 = append(s2, val)
 }
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index eeebb5a166c..d8e8591932e 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -209,6 +209,7 @@ The following items of a project are imported:
 - Repository description.
 - Git repository data.
 - Branch protection rules. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22650) in GitLab 15.4.
+- Collaborators (members). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/388716) in GitLab 15.10.
 - Issues.
 - Pull requests.
 - Wiki pages.
@@ -267,6 +268,24 @@ Mapping GitHub rule **Require status checks to pass before merging** to
 into GitLab due to technical difficulties. You can still create [external status checks](../merge_requests/status_checks.md)
 manually.
 
+### Collaborators (members)
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/388716) in GitLab 15.10.
+
+These GitHub collaborator roles are mapped to these GitLab [member roles](../../permissions.md#roles):
+
+| GitHub role | Mapped GitLab role |
+|:------------|:-------------------|
+| Read        | Guest              |
+| Triage      | Reporter           |
+| Write       | Developer          |
+| Maintain    | Maintainer         |
+| Admin       | Owner              |
+
+GitHub Enterprise Cloud has
+[custom repository roles](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-repository-roles).
+These roles aren't supported and cause partial imports.
+
 ## Alternative way to import notes and diff notes
 
 When GitHub Importer runs on extremely large projects not all notes & diff notes can be imported due to GitHub API `issues_comments` & `pull_requests_comments` endpoints limitation.