diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-28 16:48:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-28 16:48:03 +0000 |
| commit | eb400b5e029ce35c516056043560ab880276334f (patch) | |
| tree | e7adde6af6c73a160a01a3d427881bdbf3f84cdd | |
| parent | 0ea75205df7646c7682d3145e17a292fd632835b (diff) | |
| parent | e55e814e20ebb57fcf4a0e2fb7e5fd89cea10eb5 (diff) | |
| download | gitlab-ce-eb400b5e029ce35c516056043560ab880276334f.tar.gz | |
Merge branch 'sh-bump-sidekiq-5.0.5' into 'master'
Bump Sidekiq version to 5.0.5
See merge request gitlab-org/gitlab-ce!16151
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0b714b6fe5d..83c8637c28d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -708,7 +708,7 @@ GEM json recursive-open-struct (1.0.0) redcarpet (3.4.0) - redis (3.3.3) + redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -839,11 +839,11 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.4) + sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) + redis (>= 3.3.4, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) |