diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 18:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 18:07:43 +0300 |
| commit | 7eca3f56625526ffa7f263c1fef0fcea34de8ca6 (patch) | |
| tree | fec87c2a902e3c44f89963f4b28e6de32c0806f3 /lib/gitlab/sidekiq_config | |
| parent | 988424215cf104d9ee24bb1751141424cffb32d1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_config')
| -rw-r--r-- | lib/gitlab/sidekiq_config/dummy_worker.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_config/dummy_worker.rb b/lib/gitlab/sidekiq_config/dummy_worker.rb index 8a2ea1acaab..ba1f2b8d2ab 100644 --- a/lib/gitlab/sidekiq_config/dummy_worker.rb +++ b/lib/gitlab/sidekiq_config/dummy_worker.rb @@ -22,6 +22,10 @@ module Gitlab @attributes[:queue] end + def queue + @attributes[:queue] + end + def queue_namespace nil end diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index 1e3fb675ca7..1abdcde6a15 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -9,7 +9,7 @@ module Gitlab delegate :feature_category_not_owned?, :generated_queue_name, :get_feature_category, :get_sidekiq_options, :get_tags, :get_urgency, :get_weight, - :get_worker_resource_boundary, :idempotent?, :queue_namespace, + :get_worker_resource_boundary, :idempotent?, :queue_namespace, :queue, :worker_has_external_dependencies?, to: :klass |