Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 19 deletions

diff --git a/app/workers/expire_build_artifacts_worker.rb b/app/workers/expire_build_artifacts_worker.rb
index 9545227fa31..383fd30e098 100644
--- a/app/workers/expire_build_artifacts_worker.rb
+++ b/app/workers/expire_build_artifacts_worker.rb
@@ -7,25 +7,6 @@ class ExpireBuildArtifactsWorker
   feature_category :continuous_integration
 
   def perform
-    if Feature.enabled?(:ci_new_expire_job_artifacts_service, default_enabled: true)
-      perform_efficient_artifacts_removal
-    else
-      perform_legacy_artifacts_removal
-    end
-  end
-
-  def perform_efficient_artifacts_removal
     Ci::DestroyExpiredJobArtifactsService.new.execute
   end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def perform_legacy_artifacts_removal
-    Rails.logger.info 'Scheduling removal of build artifacts' # rubocop:disable Gitlab/RailsLogger
-
-    build_ids = Ci::Build.with_expired_artifacts.pluck(:id)
-    build_ids = build_ids.map { |build_id| [build_id] }
-
-    ExpireBuildInstanceArtifactsWorker.bulk_perform_async(build_ids)
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
 end