diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-22 23:03:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-22 23:03:07 +0000 |
| commit | b1adff828c91f193b2f438f58705aff5a4724ad9 (patch) | |
| tree | db59d717e8c3e2fac62497c1e0967b69051268ae /Gemfile.lock | |
| parent | c56da88115ea1e938ea8eff877f3bdb56d7d4567 (diff) | |
| parent | 60b5b22241046498c53a0ddb8509b4ebbf2b9315 (diff) | |
| download | gitlab-ce-b1adff828c91f193b2f438f58705aff5a4724ad9.tar.gz | |
Merge branch 'upgrade-sidekiq' into 'master'
Update Sidekiq and related gems (bundle update sidekiq)
Closes #15079
See merge request !3817
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b00d7b35c84..e1c07a9ccb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM execjs coffee-script-source (1.10.0) colorize (0.7.7) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) connection_pool (2.2.0) coveralls (0.8.13) json (~> 1.8) @@ -629,7 +629,7 @@ GEM recaptcha (1.0.2) json redcarpet (3.3.3) - redis (3.2.2) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -736,10 +736,9 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.0.1) + sidekiq (4.1.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - json (~> 1.0) redis (~> 3.2, >= 3.2.1) sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) |