diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-25 17:11:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-25 17:11:15 +0000 |
| commit | 226e184d6ae5d249016acbd0661e94b006193da9 (patch) | |
| tree | 0acce9dce457ce23a384bccc99f9a5bdfee75baf | |
| parent | 5d76a6e68266e28fb91cb7d7733262fd5ef57d90 (diff) | |
| parent | 5a8dd22766a72772f12c0008d4eb98e2b3cc264f (diff) | |
| download | gitlab-ce-226e184d6ae5d249016acbd0661e94b006193da9.tar.gz | |
Merge branch 'sh-bump-sidekiq-version' into 'master'
Upgrade Sidekiq to 4.2.10
See merge request !10899
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-sidekiq-version.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb91db1e805..69a5106ed52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -716,7 +716,7 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.7) + sidekiq (4.2.10) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) diff --git a/changelogs/unreleased/sh-bump-sidekiq-version.yml b/changelogs/unreleased/sh-bump-sidekiq-version.yml new file mode 100644 index 00000000000..5369b78b76a --- /dev/null +++ b/changelogs/unreleased/sh-bump-sidekiq-version.yml @@ -0,0 +1,4 @@ +--- +title: Upgrade Sidekiq to 4.2.10 +merge_request: +author: |