Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb
index 0f9dc3a3053..aea4209f631 100644
--- a/lib/gitlab/sidekiq_config/worker.rb
+++ b/lib/gitlab/sidekiq_config/worker.rb
@@ -6,10 +6,9 @@ module Gitlab
       include Comparable
 
       attr_reader :klass
-      delegate :feature_category_not_owned?, :get_feature_category, :get_tags,
-               :get_urgency, :get_weight, :get_worker_resource_boundary,
-               :idempotent?, :queue, :queue_namespace,
-               :worker_has_external_dependencies?,
+      delegate :feature_category_not_owned?, :get_feature_category, :get_sidekiq_options,
+               :get_tags, :get_urgency, :get_weight, :get_worker_resource_boundary,
+               :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?,
                to: :klass
 
       def initialize(klass, ee:)
@@ -65,6 +64,10 @@ module Gitlab
       def queue_and_weight
         [queue, get_weight]
       end
+
+      def retries
+        get_sidekiq_options['retry']
+      end
     end
   end
 end