diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-09-10 16:16:11 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-09-10 16:16:11 +0000 |
| commit | 0078ea44c292cd0e5eb7f4ae52358087c8ee34db (patch) | |
| tree | 97cecf00526d3548d0a8d5074f502f2f4bd62596 /config | |
| parent | 7e8453fe926325ccffbadb509c59b8a5e1867886 (diff) | |
| parent | eeeaebe60813393940751ea9bf81e720b65bf95a (diff) | |
| download | gitlab-ce-0078ea44c292cd0e5eb7f4ae52358087c8ee34db.tar.gz | |
Merge branch 'sidekiq-monitor-namespace-change' into 'master'
Sidekiq monitor namespace change
See merge request gitlab-org/gitlab-ce!32878
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9f3e104bc2b..20f31ff6810 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -60,7 +60,7 @@ Sidekiq.configure_server do |config| # Sidekiq (e.g. in an initializer). ActiveRecord::Base.clear_all_connections! - Gitlab::SidekiqMonitor.instance.start if enable_sidekiq_monitor + Gitlab::SidekiqDaemon::Monitor.instance.start if enable_sidekiq_monitor end if enable_reliable_fetch? |