diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-14 13:39:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-14 13:39:27 +0000 |
| commit | ca9bce4aa1a7b40616f83c9f2cd5ed452e253001 (patch) | |
| tree | 177d5f878a98b215169ef6128e0428b64e5fbcd0 /Gemfile.lock | |
| parent | 8c4cff99e630fd62f8d6f89a1cb1fd2aa6f3336e (diff) | |
| parent | fd809f5e0634f167f5bb5acfd30e374acf7adf07 (diff) | |
| download | gitlab-ce-ca9bce4aa1a7b40616f83c9f2cd5ed452e253001.tar.gz | |
Merge branch 'update-sidekiq' into 'master'
update sidekiq 5.0 -> 5.1
See merge request gitlab-org/gitlab-ce!18765
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6028ce32d2f..0deeeab6378 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -846,11 +846,11 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.5) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (>= 3.3.4, < 5) + redis (>= 3.3.5, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) @@ -1177,7 +1177,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.0) + sidekiq (~> 5.1) sidekiq-cron (~> 0.6.0) sidekiq-limit_fetch (~> 3.4) simple_po_parser (~> 1.1.2) |