diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-08-06 10:27:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-08-06 10:27:21 +0000 |
| commit | a445dc2e6797b01cedd85f8b59df775e5748662a (patch) | |
| tree | 6d1aef8cd9c719fcdccad9832c6848561b348c7d | |
| parent | 2e9b4f6034b49ef18a7e2ccb881657c4428e98a9 (diff) | |
| parent | f88189e23afd4147be960c023bce4062262d43c3 (diff) | |
| download | gitlab-ce-a445dc2e6797b01cedd85f8b59df775e5748662a.tar.gz | |
Merge branch 'update-reliable-fetcher' into 'master'
Update reliable fetcher
See merge request gitlab-org/gitlab-ce!31416
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/workers/chaos/kill_worker.rb | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 769af1fa20e..368cbef4577 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/app/workers/chaos/kill_worker.rb b/app/workers/chaos/kill_worker.rb index bbad53c9b86..80f04db1be4 100644 --- a/app/workers/chaos/kill_worker.rb +++ b/app/workers/chaos/kill_worker.rb @@ -5,6 +5,8 @@ module Chaos include ApplicationWorker include ChaosQueue + sidekiq_options retry: false + def perform Gitlab::Chaos.kill end |