resolve config/initializers/sidekiq.rb

10ba0af1 · Valery Sizov · Mike Greiling · c1a6c0b8 · 10ba0af1
Commit 10ba0af1 authored Sep 25, 2018 by Valery Sizov Committed by Mike Greiling Sep 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/initializers/sidekiq.rb config/initializers/sidekiq.rb +0 -3

No files found.
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -55,13 +55,10 @@ Sidekiq.configure_server do |config|
  end
  Sidekiq::Cron::Job.load_from_hash! cron_jobs

-<<<<<<< HEAD
  Gitlab::Mirror.configure_cron_job!

  Gitlab::Geo.configure_cron_jobs!

-=======
->>>>>>> 0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb
  Gitlab::SidekiqVersioning.install!

  config = Gitlab::Database.config ||