diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-26 09:59:48 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-26 09:59:52 -0500 |
| commit | da9d787ac0ee3a193b70acf6535d9d5722db4f1a (patch) | |
| tree | 0850b214d69a56505182cf765e872b3c83c27cff | |
| parent | d39b16d06d9e98fbd1898140341a0e08ee61edf3 (diff) | |
| download | gitlab-ce-da9d787ac0ee3a193b70acf6535d9d5722db4f1a.tar.gz | |
Bump Sidekiq to 5.0.0dm-sidekiq-5
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-sidekiq-5.yml | 4 |
3 files changed, 9 insertions, 5 deletions
@@ -144,7 +144,7 @@ gem 'after_commit_queue', '~> 1.3.0' gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sidekiq', '~> 4.2.7' +gem 'sidekiq', '~> 5.0' gem 'sidekiq-cron', '~> 0.4.4' gem 'redis-namespace', '~> 1.5.2' gem 'sidekiq-limit_fetch', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index fb11f590110..4c3b2480b54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -603,7 +603,7 @@ GEM json recursive-open-struct (1.0.0) redcarpet (3.4.0) - redis (3.2.2) + redis (3.3.3) redis-actionpack (5.0.1) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -717,11 +717,11 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.10) + sidekiq (5.0.0) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) + redis (~> 3.3, >= 3.3.3) sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) @@ -1007,7 +1007,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.2.7) + sidekiq (~> 5.0) sidekiq-cron (~> 0.4.4) sidekiq-limit_fetch (~> 3.4) simplecov (~> 0.14.0) diff --git a/changelogs/unreleased/dm-sidekiq-5.yml b/changelogs/unreleased/dm-sidekiq-5.yml new file mode 100644 index 00000000000..69c94b18929 --- /dev/null +++ b/changelogs/unreleased/dm-sidekiq-5.yml @@ -0,0 +1,4 @@ +--- +title: Bump Sidekiq to 5.0.0 +merge_request: +author: |