Commit 325a6c03 authored by Stan Hu's avatar Stan Hu

Revert "Merge branch '343695-upgrade-sidekiq-cron' into 'master'"

This reverts merge request !73093
parent a1c814cb
......@@ -196,7 +196,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
# Background jobs
gem 'sidekiq', '~> 6.2.2'
gem 'sidekiq-cron', '~> 1.2'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.8.1'
gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
......
......@@ -1172,7 +1172,7 @@ GEM
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
sidekiq-cron (1.2.0)
sidekiq-cron (1.0.4)
fugit (~> 1.1)
sidekiq (>= 4.2.1)
signet (0.14.0)
......@@ -1611,7 +1611,7 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
sidekiq (~> 6.2.2)
sidekiq-cron (~> 1.2)
sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.18.5)
simplecov-cobertura (~> 1.3.1)
......
......@@ -2,7 +2,6 @@
# This is needed for sidekiq-cluster
require 'json'
require 'sidekiq/job_retry'
module Gitlab
module SidekiqLogging
......
......@@ -2,8 +2,6 @@
require 'active_record'
require 'active_record/log_subscriber'
require 'sidekiq/job_logger'
require 'sidekiq/job_retry'
module Gitlab
module SidekiqLogging
......
# frozen_string_literal: true
require 'sidekiq/job_retry'
module Gitlab
module SidekiqMiddleware
class Monitor
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment