diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-12 17:41:38 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-12 17:41:38 +0100 |
| commit | 6174ea77a5aa1eec1e3375e26a2c1b9f72bf35de (patch) | |
| tree | 6429fca22e7188d27f661df9aace3876f0f92ff9 /lib | |
| parent | ae9838d03556a15d5543a9c42a97d5cf6e3085e9 (diff) | |
| download | gitlab-ce-6174ea77a5aa1eec1e3375e26a2c1b9f72bf35de.tar.gz | |
Backport support for finding EE workers
This backports support for finding EE workers in ee/app/workers from EE
to CE, since we already do this for the configuration paths constant.
This removes the need for EE specific modules.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/sidekiq_config.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_config.rb b/lib/gitlab/sidekiq_config.rb index 3b8de64913b..fb303e3fb0c 100644 --- a/lib/gitlab/sidekiq_config.rb +++ b/lib/gitlab/sidekiq_config.rb @@ -48,7 +48,9 @@ module Gitlab end def self.workers - @workers ||= find_workers(Rails.root.join('app', 'workers')) + @workers ||= + find_workers(Rails.root.join('app', 'workers')) + + find_workers(Rails.root.join('ee', 'app', 'workers')) end def self.find_workers(root) |