Merge branch 'mk/fix-synchronization-disabled' into 'master'

Geo: Fix inaccurate "Synchronization disabled" progress bars

Closes #221069

See merge request gitlab-org/gitlab!36492

ee/app/models/geo/job_artifact_registry.rb

@@ -41,8 +41,4 @@ class Geo::JobArtifactRegistry < Geo::BaseRegistry
       delete_worker_class.perform_async(:job_artifact, artifact_id)
     end
   end
-
-  def self.replication_enabled?
-    JobArtifactUploader.object_store_enabled? ? Gitlab::Geo.current_node.sync_object_storage? : true
-  end
 end

ee/app/models/geo/upload_registry.rb

@@ -60,10 +60,6 @@ class Geo::UploadRegistry < Geo::BaseRegistry
     end
   end
 
-  def self.replication_enabled?
-    FileUploader.object_store_enabled? ? Gitlab::Geo.current_node.sync_object_storage? : true
-  end
-
   def file
     upload&.path || s_('Removed %{type} with id %{id}') % { type: file_type, id: file_id }
   end

ee/changelogs/unreleased/mk-fix-upload-and-artifact-synchronization-disabled.yml

+---
+title: 'Geo: Fix Attachments and Job artifacts showing "Synchronization disabled"'
+merge_request: 36492
+author:
+type: fixed

ee/spec/models/geo/job_artifact_registry_spec.rb

@@ -23,30 +23,4 @@ RSpec.describe Geo::JobArtifactRegistry, :geo do
       expect(described_class.where(id: ids).pluck(:success)).to eq([false])
     end
   end
-
-  describe '.replication_enabled?' do
-    context 'when Object Storage is enabled' do
-      before do
-        allow(JobArtifactUploader).to receive(:object_store_enabled?).and_return(true)
-      end
-
-      it 'returns true when Geo Object Storage replication is enabled' do
-        stub_current_geo_node(double(sync_object_storage?: true))
-
-        expect(Geo::JobArtifactRegistry.replication_enabled?).to be_truthy
-      end
-
-      it 'returns false when Geo Object Storage replication is disabled' do
-        stub_current_geo_node(double(sync_object_storage?: false))
-
-        expect(Geo::JobArtifactRegistry.replication_enabled?).to be_falsey
-      end
-    end
-
-    it 'returns true when Object Storage is disabled' do
-      allow(JobArtifactUploader).to receive(:object_store_enabled?).and_return(false)
-
-      expect(Geo::JobArtifactRegistry.replication_enabled?).to be_truthy
-    end
-  end
 end

ee/spec/models/geo/upload_registry_spec.rb

@@ -107,28 +107,4 @@ RSpec.describe Geo::UploadRegistry, :geo, :geo_fdw do
       expect(failed.synchronization_state).to eq(:failed)
     end
   end
-
-  describe '.replication_enabled?' do
-    context 'when Object Storage is enabled' do
-      before do
-        allow(FileUploader).to receive(:object_store_enabled?).and_return(true)
-      end
-
-      it 'returns true when Geo Object Storage replication is enabled' do
-        stub_current_geo_node(double(sync_object_storage?: true))
-
-        expect(Geo::UploadRegistry.replication_enabled?).to be_truthy
-      end
-
-      it 'returns false when Geo Object Storage replication is disabled' do
-        stub_current_geo_node(double(sync_object_storage?: false))
-
-        expect(Geo::UploadRegistry.replication_enabled?).to be_falsey
-      end
-    end
-
-    it 'returns true when Object Storage is disabled' do
-      expect(Geo::UploadRegistry.replication_enabled?).to be_truthy
-    end
-  end
 end