Merge branch '353995-enable-feature-flag-enable-geo_job_artifact_replication-again' into 'master'

Enable geo_job_artifact_replication again

See merge request gitlab-org/gitlab!85129

doc/api/graphql/reference/index.md

@@ -11068,7 +11068,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 ##### `GeoNode.jobArtifactRegistries`
 
-Find Job Artifact registries on this Geo node Available only when feature flag `geo_job_artifact_replication` is enabled. This flag is disabled by default, because the feature is experimental and is subject to change without notice.
+Find Job Artifact registries on this Geo node.
 
 Returns [`JobArtifactRegistryConnection`](#jobartifactregistryconnection).
 

ee/app/graphql/types/geo/geo_node_type.rb

@@ -19,8 +19,7 @@ module Types
       field :job_artifact_registries, ::Types::Geo::JobArtifactRegistryType.connection_type,
             null: true,
             resolver: ::Resolvers::Geo::JobArtifactRegistriesResolver,
-            description: 'Find Job Artifact registries on this Geo node',
-            feature_flag: :geo_job_artifact_replication
+            description: 'Find Job Artifact registries on this Geo node'
       field :lfs_object_registries, ::Types::Geo::LfsObjectRegistryType.connection_type,
             null: true,
             resolver: ::Resolvers::Geo::LfsObjectRegistriesResolver,

ee/app/models/geo/job_artifact_registry.rb

@@ -36,12 +36,6 @@ class Geo::JobArtifactRegistry < Geo::BaseRegistry
     ::Geo::FileRegistryRemovalWorker
   end
 
-  # TODO Remove this when enabling geo_job_artifact_replication by default
-  override :registry_consistency_worker_enabled?
-  def self.registry_consistency_worker_enabled?
-    true
-  end
-
   def self.failed
     if ::Geo::JobArtifactReplicator.enabled?
       with_state(:failed)

ee/app/replicators/geo/job_artifact_replicator.rb

@@ -13,12 +13,6 @@ module Geo
       model_record.file
     end
 
-    # The feature flag follows the format `geo_#{replicable_name}_replication`,
-    # so here it would be `geo_job_artifact_replication`
-    def self.replication_enabled_by_default?
-      false
-    end
-
     override :verification_feature_flag_enabled?
     def self.verification_feature_flag_enabled?
       # We are adding verification at the same time as replication, so we

ee/config/feature_flags/development/geo_job_artifact_replication.yml

 ---
 name: geo_job_artifact_replication
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327400
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353995
 milestone: '14.8'
 type: development
 group: group::geo
-default_enabled: false
+default_enabled: true