From 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 13 Nov 2019 09:06:41 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/workers/expire_build_artifacts_worker.rb | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'app/workers/expire_build_artifacts_worker.rb')

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
-- 
cgit v1.2.1