Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 25 deletions

diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb
deleted file mode 100644
index 7a77a56d642..00000000000
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'digest'
-
-module Gitlab
-  module SidekiqMiddleware
-    module DuplicateJobs
-      DROPPABLE_QUEUES = Set.new([
-        Namespaces::RootStatisticsWorker.queue,
-        Namespaces::ScheduleAggregationWorker.queue
-      ]).freeze
-
-      def self.drop_duplicates?(queue_name)
-        Feature.enabled?(:drop_duplicate_sidekiq_jobs) ||
-          drop_duplicates_for_queue?(queue_name)
-      end
-
-      private_class_method def self.drop_duplicates_for_queue?(queue_name)
-        DROPPABLE_QUEUES.include?(queue_name) &&
-          Feature.enabled?(:drop_duplicate_sidekiq_jobs_for_queue)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
index a9007039334..79bbb99752e 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
@@ -67,7 +67,7 @@ module Gitlab
         end
 
         def droppable?
-          idempotent? && duplicate? && DuplicateJobs.drop_duplicates?(queue_name)
+          idempotent? && duplicate?
         end
 
         private