summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-04-24 21:45:53 -0700
committerStan Hu <stanhu@gmail.com>2017-04-24 21:48:05 -0700
commit5a8dd22766a72772f12c0008d4eb98e2b3cc264f (patch)
treeabcde3b34c024d4c247e6de67881a0bd49571c32
parent080aac050d852c332181a0e3fed7821d52d16c1a (diff)
downloadgitlab-ce-sh-bump-sidekiq-version.tar.gz
Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-version
See https://github.com/mperham/sidekiq/blob/master/Changes.md#4210
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/sh-bump-sidekiq-version.yml4
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: