summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-11 15:20:10 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-11 15:20:10 +0000
commite785478a26d7be9271bb72ecb2c250d9823f8948 (patch)
treeed3254fc78a59c2f16a27dcca603652e8ef11fef
parent2e9517af8ea9b56954a1c48992c8ada408e8d331 (diff)
parent1f5b77715362eccbd7a2d37f9783aeb19260df75 (diff)
downloadgitlab-ce-e785478a26d7be9271bb72ecb2c250d9823f8948.tar.gz
Merge branch 'sh-bump-sidekiq' into 'master'
Update Sidekiq from 5.0.0 to 5.0.4 See merge request !12774
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index deaf3ded2f9..085ae9fe63e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -780,7 +780,7 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
- sidekiq (5.0.0)
+ sidekiq (5.0.4)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)