diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-19 13:45:20 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-19 13:45:20 -0800 |
| commit | 02e6583496d22215cf87462f2a027f71ab0b7c1f (patch) | |
| tree | 1e45f2681b83ef7a6a2ba13ce1c82e53e91e4506 | |
| parent | b1321dedaad5415de151480eb2a76c131437d29e (diff) | |
| download | gitlab-ce-sh-downgrade-sidekiq-5.2.1.tar.gz | |
Downgrade to Sidekiq 5.2.1sh-downgrade-sidekiq-5.2.1
https://github.com/mperham/sidekiq/pull/3936/files introduced a change
that prevents defining the same queue per process. This will effectively
prevent many of our sidekiq-cluster processes from running.
Revert to 5.2.1 until that issue is resolved.
Closes #54253
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -171,7 +171,8 @@ gem 'state_machines-activerecord', '~> 0.5.1' gem 'acts-as-taggable-on', '~> 5.0' # Background jobs -gem 'sidekiq', '~> 5.2.1' +# Locked until https://github.com/mperham/sidekiq/issues/4022 is fixed +gem 'sidekiq', '= 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 975243f31d5..5d2121884a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -813,7 +813,7 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.1) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) @@ -1134,7 +1134,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.2.1) + sidekiq (= 5.2.1) sidekiq-cron (~> 0.6.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 657975da2a4..69d9b4ff858 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -805,7 +805,7 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.1) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) @@ -1124,7 +1124,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.2.1) + sidekiq (= 5.2.1) sidekiq-cron (~> 0.6.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) |