Automatic merge of gitlab-org/gitlab master

.gitlab/issue_templates/Geo Replicate a new Git repository type.md

@@ -454,7 +454,7 @@ That's all of the required database changes.
   ```
 
 - [ ] Update `REGISTRY_CLASSES` in `ee/app/workers/geo/secondary/registry_consistency_worker.rb`.
-- [ ] Update `def model_class_factory_name` in `ee/spec/services/geo/registry_consistency_service_spec.rb`.
+- [ ] Add a custom factory name if needed in `def model_class_factory_name` in `ee/spec/services/geo/registry_consistency_service_spec.rb`.
 - [ ] Update `it 'creates missing registries for each registry class'` in `ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb`.
 - [ ] Add `cool_widget_registry` to `ActiveSupport::Inflector.inflections` in `config/initializers_before_autoloader/000_inflections.rb`.
 - [ ] Create `ee/spec/factories/geo/cool_widget_registry.rb`:

.gitlab/issue_templates/Geo Replicate a new blob type.md

@@ -421,7 +421,7 @@ That's all of the required database changes.
   ```
 
 - [ ] Update `REGISTRY_CLASSES` in `ee/app/workers/geo/secondary/registry_consistency_worker.rb`.
-- [ ] Update `def model_class_factory_name` in `ee/spec/services/geo/registry_consistency_service_spec.rb`.
+- [ ] Add a custom factory name if needed in `def model_class_factory_name` in `ee/spec/services/geo/registry_consistency_service_spec.rb`.
 - [ ] Update `it 'creates missing registries for each registry class'` in `ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb`.
 - [ ] Add `cool_widget_registry` to `ActiveSupport::Inflector.inflections` in `config/initializers_before_autoloader/000_inflections.rb`.
 - [ ] Create `ee/spec/factories/geo/cool_widget_registry.rb`:

doc/administration/geo/replication/datatypes.md

@@ -47,8 +47,8 @@ verification methods:
 | 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    | Package registry _(file system)_                | Geo with API                          | SHA256 checksum        |
-| Blobs    | Package registry _(object storage)_             | Geo with API/Managed (*2*)            | _Not implemented_        |
-| Blobs    | Versioned Terraform State _(file system)_       | Geo with API                          | SHA256 checksum      |
+| Blobs    | Package registry _(object storage)_             | Geo with API/Managed (*2*)            | _Not implemented_      |
+| Blobs    | Versioned Terraform State _(file system)_       | Geo with API                          | SHA256 checksum        |
 | Blobs    | Versioned Terraform State _(object storage)_    | Geo with API/Managed (*2*)            | _Not implemented_      |
 | Blobs    | External Merge Request Diffs _(file system)_    | Geo with API                          | _Not implemented_      |
 | Blobs    | External Merge Request Diffs _(object storage)_ | Geo with API/Managed (*2*)            | _Not implemented_      |
@@ -200,7 +200,7 @@ successfully, you must replicate their data using some other means.
 |[Package Registry for generic packages](../../../user/packages/generic_packages/index.md)                      | **Yes** (13.5)                                                          | [**Yes**](#limitation-of-verification-for-files-in-object-storage) (13.10)                                                         | Via Object Storage provider if supported. Native Geo support (Beta).          | Behind feature flag `geo_package_file_replication`, enabled by default. |
 |[Versioned Terraform State](../../terraform_state.md)                                                          | **Yes** (13.5)                                                          | [**Yes**](#limitation-of-verification-for-files-in-object-storage) (13.12)                                                                     | Via Object Storage provider if supported. Native Geo support (Beta).          | Replication is behind the feature flag `geo_terraform_state_version_replication`, enabled by default. Verification was behind the feature flag `geo_terraform_state_version_verification`, which was removed in 14.0|
 |[External merge request diffs](../../merge_request_diffs.md)                                                   | **Yes** (13.5)                                                          | No                                                                      | Via Object Storage provider if supported. Native Geo support (Beta).          | Replication is behind the feature flag `geo_merge_request_diff_replication`, enabled by default. Verification is under development, behind the feature flag `geo_merge_request_diff_verification`, introduced in 14.0.|
-|[Versioned snippets](../../../user/snippets.md#versioned-snippets)                                             | [**Yes** (13.7)](https://gitlab.com/groups/gitlab-org/-/epics/2809)     | [No](https://gitlab.com/groups/gitlab-org/-/epics/2810)                 | No                                                                            |       |
+|[Versioned snippets](../../../user/snippets.md#versioned-snippets)                                             | [**Yes** (13.7)](https://gitlab.com/groups/gitlab-org/-/epics/2809)     | [**Yes**](https://gitlab.com/groups/gitlab-org/-/epics/2810)            | No                                                                            | Verification was implemented behind the feature flag `geo_snippet_repository_verification` in 13.11, and the feature flag was removed in 14.2. |
 |[Server-side Git hooks](../../server_hooks.md)                                                                 | [No](https://gitlab.com/groups/gitlab-org/-/epics/1867)                 | No                                                                      | No                                                                            |       |
 |[Elasticsearch integration](../../../integration/elasticsearch.md)                                             | [No](https://gitlab.com/gitlab-org/gitlab/-/issues/1186)                | No                                                                      | No                                                                            |       |
 |[GitLab Pages](../../pages/index.md)                                                                           | [No](https://gitlab.com/groups/gitlab-org/-/epics/589)                  | No                                                                      | Via Object Storage provider if supported. **No** native Geo support (Beta).                                                                            |       |

ee/app/assets/javascripts/related_items_tree/store/actions.js

@@ -124,9 +124,8 @@ export const fetchItems = ({ dispatch }, { parentItem, isSubItem = false }) => {
         pageInfo: data.group.epic.issues.pageInfo,
       });
 
-      dispatch('setWeightSum', data.group.epic.descendantWeightSum);
-
       if (!isSubItem) {
+        dispatch('setWeightSum', data.group.epic.descendantWeightSum);
         dispatch('setChildrenCount', data.group.epic.descendantCounts);
         dispatch('setHealthStatus', data.group.epic.healthStatus);
       }

ee/app/replicators/geo/snippet_repository_replicator.rb

@@ -15,7 +15,7 @@ module Geo
 
     override :verification_feature_flag_enabled?
     def self.verification_feature_flag_enabled?
-      Feature.enabled?(:geo_snippet_repository_verification, default_enabled: :yaml)
+      true
     end
 
     def repository

ee/config/feature_flags/development/geo_snippet_repository_verification.yml

----
-name: geo_snippet_repository_verification
-introduced_by_url: 
-rollout_issue_url: 
-milestone: '13.10'
-type: development
-group: group::geo
-default_enabled: false

ee/spec/frontend/related_items_tree/store/actions_spec.js

@@ -448,6 +448,71 @@ describe('RelatedItemTree', () => {
           );
         });
 
+        it('should not dispatch `setWeightSum`, `setChildrenCount`, `setHealthStatus` when isSubItem is true', () => {
+          jest.spyOn(epicUtils.gqClient, 'query').mockReturnValue(
+            Promise.resolve({
+              data: mockQueryResponse.data,
+            }),
+          );
+
+          const children = epicUtils.processQueryResponse(mockQueryResponse.data.group);
+
+          const {
+            children: { pageInfo: epicPageInfo },
+            issues: { pageInfo: issuesPageInfo },
+          } = mockQueryResponse.data.group.epic;
+
+          testAction(
+            actions.fetchItems,
+            { parentItem: mockParentItem, isSubItem: true },
+            {},
+            [],
+            [
+              {
+                type: 'requestItems',
+                payload: { parentItem: mockParentItem, isSubItem: true },
+              },
+              {
+                type: 'receiveItemsSuccess',
+                payload: {
+                  parentItem: mockParentItem,
+                  isSubItem: true,
+                  children,
+                },
+              },
+              {
+                type: 'setItemChildren',
+                payload: {
+                  parentItem: mockParentItem,
+                  isSubItem: true,
+                  children,
+                },
+              },
+              {
+                type: 'setItemChildrenFlags',
+                payload: {
+                  isSubItem: true,
+                  children,
+                },
+              },
+              {
+                type: 'setEpicPageInfo',
+                payload: {
+                  parentItem: mockParentItem,
+                  pageInfo: epicPageInfo,
+                },
+              },
+              {
+                type: 'setIssuePageInfo',
+                payload: {
+                  parentItem: mockParentItem,
+                  pageInfo: issuesPageInfo,
+                },
+              },
+            ],
+          );
+        });
+
         it('should dispatch `receiveItemsFailure` on request failure', () => {
           jest.spyOn(epicUtils.gqClient, 'query').mockReturnValue(Promise.reject());
 

ee/spec/services/geo/registry_consistency_service_spec.rb

@@ -19,10 +19,7 @@ RSpec.describe Geo::RegistryConsistencyService, :geo, :use_clean_rails_memory_st
     {
       Geo::DesignRegistry => :project_with_design,
       Geo::MergeRequestDiffRegistry => :external_merge_request_diff,
-      Geo::PackageFileRegistry => :package_file_with_file,
-      Geo::SnippetRepositoryRegistry => :snippet_repository,
-      Geo::TerraformStateVersionRegistry => :terraform_state_version,
-      Geo::PipelineArtifactRegistry => :ci_pipeline_artifact
+      Geo::PackageFileRegistry => :package_file
      }.fetch(registry_class, default_factory_name)
   end