Commit 2ed0bc63 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'mk/remove-flag-geo_object_storage_replication' into 'master'

Geo: Enable replicating uploads, LFS objects, and artifacts in Object Storage

Closes #33276

See merge request gitlab-org/gitlab!18482
parents f3e28caa b7c4a534
---
title: 'Geo: Enable replicating uploads, LFS objects, and artifacts in Object Storage'
merge_request: 18482
author:
type: added
......@@ -70,8 +70,7 @@
= form.number_field :minimum_reverification_interval, class: 'form-control col-sm-2', min: 1
.form-text.text-muted= s_('Geo|Control the minimum interval in days that a repository should be reverified for this primary node')
- if ::Feature.enabled?(:geo_object_storage_replication)
.form-group.row.js-hide-if-geo-primary{ class: ('hidden' unless geo_node.secondary?) }
.form-group.row.js-hide-if-geo-primary{ class: ('hidden' unless geo_node.secondary?) }
.col-sm-10
= form.label :sync_object_storage, _('Object Storage replication'), class: 'label-bold'
.form-check
......@@ -79,4 +78,3 @@
= form.label :sync_object_storage, class: 'form-check-label' do
%span= s_('Geo|Allow this secondary node to replicate content on Object Storage')
.form-text.text-muted= s_('Geo|If enabled, and if object storage is enabled, GitLab will handle Object Storage replication using Geo')
......@@ -571,7 +571,7 @@ module EE
expose :repos_max_capacity
expose :verification_max_capacity
expose :container_repositories_max_capacity
expose :sync_object_storage, if: ->(geo_node, _) { ::Feature.enabled?(:geo_object_storage_replication) && geo_node.secondary? }
expose :sync_object_storage, if: ->(geo_node, _) { geo_node.secondary? }
# Retained for backwards compatibility. Remove in API v5
expose :clone_protocol do |_record, _options|
......
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