Merge branch 'update-reliable-fetcher' into 'master'
Update reliable fetcher See merge request gitlab-org/gitlab-ce!31416
This commit is contained in:
commit
a445dc2e67
2
Gemfile
2
Gemfile
|
@ -170,7 +170,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
|
|||
gem 'sidekiq', '~> 5.2.7'
|
||||
gem 'sidekiq-cron', '~> 1.0'
|
||||
gem 'redis-namespace', '~> 1.6.0'
|
||||
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
|
||||
gem 'gitlab-sidekiq-fetcher', '0.5.1', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
gem 'fugit', '~> 1.2.1'
|
||||
|
|
|
@ -319,7 +319,7 @@ GEM
|
|||
jaeger-client (~> 0.10)
|
||||
opentracing (~> 0.4)
|
||||
gitlab-markup (1.7.0)
|
||||
gitlab-sidekiq-fetcher (0.4.0)
|
||||
gitlab-sidekiq-fetcher (0.5.1)
|
||||
sidekiq (~> 5)
|
||||
gitlab-styles (2.8.0)
|
||||
rubocop (~> 0.69.0)
|
||||
|
@ -1102,7 +1102,7 @@ DEPENDENCIES
|
|||
github-markup (~> 1.7.0)
|
||||
gitlab-labkit (~> 0.3.0)
|
||||
gitlab-markup (~> 1.7.0)
|
||||
gitlab-sidekiq-fetcher (~> 0.4.0)
|
||||
gitlab-sidekiq-fetcher (= 0.5.1)
|
||||
gitlab-styles (~> 2.7)
|
||||
gitlab_omniauth-ldap (~> 2.1.1)
|
||||
gon (~> 6.2)
|
||||
|
|
|
@ -5,6 +5,8 @@ module Chaos
|
|||
include ApplicationWorker
|
||||
include ChaosQueue
|
||||
|
||||
sidekiq_options retry: false
|
||||
|
||||
def perform
|
||||
Gitlab::Chaos.kill
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue