Merge branch 'sh-bump-sidekiq-version' into 'master'

Upgrade Sidekiq to 4.2.10 See merge request !10899

Merge branch 'sh-bump-sidekiq-version' into 'master'
Upgrade Sidekiq to 4.2.10 See merge request !10899
226e184d · Robert Speicher · 5d76a6e6 · 5a8dd227 · 226e184d · 226e184d
Commit 226e184d authored Apr 25, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/sh-bump-sidekiq-version.yml changelogs/unreleased/sh-bump-sidekiq-version.yml +4 -0

No files found.
--- 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)

--- a/changelogs/unreleased/sh-bump-sidekiq-version.yml
+++ b/changelogs/unreleased/sh-bump-sidekiq-version.yml
+---
+title: Upgrade Sidekiq to 4.2.10
+merge_request:
+author: