diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /lib/gitlab/sidekiq_config | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'lib/gitlab/sidekiq_config')
-rw-r--r-- | lib/gitlab/sidekiq_config/cli_methods.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_config/cli_methods.rb b/lib/gitlab/sidekiq_config/cli_methods.rb index 8eef15f9ccb..70798f8c3e8 100644 --- a/lib/gitlab/sidekiq_config/cli_methods.rb +++ b/lib/gitlab/sidekiq_config/cli_methods.rb @@ -18,6 +18,7 @@ module Gitlab QUEUE_CONFIG_PATHS = begin result = %w[app/workers/all_queues.yml] result << 'ee/app/workers/all_queues.yml' if Gitlab.ee? + result << 'jh/app/workers/all_queues.yml' if Gitlab.jh? result end.freeze diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index a343573440f..1e3fb675ca7 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -13,15 +13,20 @@ module Gitlab :worker_has_external_dependencies?, to: :klass - def initialize(klass, ee:) + def initialize(klass, ee:, jh: false) @klass = klass @ee = ee + @jh = jh end def ee? @ee end + def jh? + @jh + end + def ==(other) to_yaml == case other when self.class |