Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 7 deletions

diff --git a/app/workers/projects/git_garbage_collect_worker.rb b/app/workers/projects/git_garbage_collect_worker.rb
index 32bffc3ab6a..d99737f0567 100644
--- a/app/workers/projects/git_garbage_collect_worker.rb
+++ b/app/workers/projects/git_garbage_collect_worker.rb
@@ -24,15 +24,13 @@ module Projects
       rescue Gitlab::Git::CommandTimedOut, GRPC::Internal => e
         Gitlab::ErrorTracking.track_exception(e)
       end
-
-      cleanup_orphan_lfs_file_references(resource) unless reorder_feature_flag?(resource)
     end
 
     override :after_gitaly_call
     def after_gitaly_call(task, resource)
       return unless gc?(task)
 
-      cleanup_orphan_lfs_file_references(resource) if reorder_feature_flag?(resource)
+      cleanup_orphan_lfs_file_references(resource)
     end
 
     def cleanup_orphan_lfs_file_references(resource)
@@ -52,9 +50,5 @@ module Projects
     def stats
       [:repository_size, :lfs_objects_size]
     end
-
-    def reorder_feature_flag?(resource)
-      Feature.enabled?(:reorder_garbage_collection_calls, resource, type: :gitlab_com_derisk)
-    end
   end
 end