Commit 6fd0e4eb authored by Michael Kozono's avatar Michael Kozono

Merge branch 'enable-ssf-upload-replication' into 'master'

Enable Upload replication using SSF by default

See merge request gitlab-org/gitlab!72199
parents fd692476 99543ee5
......@@ -10171,7 +10171,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
##### `GeoNode.uploadRegistries`
Find Upload registries on this Geo node Available only when feature flag `geo_upload_replication` is enabled. This flag is disabled by default, because the feature is experimental and is subject to change without notice.
Find Upload registries on this Geo node.
Returns [`UploadRegistryConnection`](#uploadregistryconnection).
......
......@@ -57,8 +57,7 @@ module Types
field :upload_registries, ::Types::Geo::UploadRegistryType.connection_type,
null: true,
resolver: ::Resolvers::Geo::UploadRegistriesResolver,
description: 'Find Upload registries on this Geo node',
feature_flag: :geo_upload_replication
description: 'Find Upload registries on this Geo node'
end
end
end
......@@ -9,10 +9,6 @@ module Geo
::Upload
end
def self.replication_enabled_by_default?
false
end
def carrierwave_uploader
model_record.retrieve_uploader
end
......
......@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340617
milestone: '14.4'
type: development
group: group::geo
default_enabled: false
default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment