Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 6 deletions

diff --git a/app/services/projects/update_repository_storage_service.rb b/app/services/projects/update_repository_storage_service.rb
index e727181666e..9c65b261274 100644
--- a/app/services/projects/update_repository_storage_service.rb
+++ b/app/services/projects/update_repository_storage_service.rb
@@ -18,7 +18,7 @@ module Projects
       project.track_project_repository
 
       # Link repository from the new shard to pool repository from the new shard
-      project.link_pool_repository if replicate_object_pool_on_move_ff_enabled?
+      project.link_pool_repository
     end
 
     def mirror_repositories
@@ -36,7 +36,6 @@ module Projects
     end
 
     def mirror_object_pool(destination_storage_name)
-      return unless replicate_object_pool_on_move_ff_enabled?
       return unless project.repository_exists?
 
       pool_repository = project.pool_repository
@@ -92,9 +91,5 @@ module Projects
         state: 'ready'
       )
     end
-
-    def replicate_object_pool_on_move_ff_enabled?
-      Feature.enabled?(:replicate_object_pool_on_move, project)
-    end
   end
 end