Commit e16f9470 authored by Michael Kozono's avatar Michael Kozono

Merge branch 'lfs-object-replicables-and-selective-sync' into 'master'

Fix bug in LfsObject.replicables_for_current_secondary

See merge request gitlab-org/gitlab!60539
parents b015914c e1b7781e
......@@ -26,7 +26,6 @@ module EE
def replicables_for_current_secondary(primary_key_in)
node = ::Gitlab::Geo.current_node
node.lfs_objects(primary_key_in: primary_key_in)
.merge(selective_sync_scope(node))
.merge(object_storage_scope(node))
end
......@@ -37,12 +36,6 @@ module EE
with_files_stored_locally
end
def selective_sync_scope(node)
return all unless node.selective_sync?
project_id_in(node.projects)
end
end
def log_geo_deleted_event
......
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