summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-04-19 05:44:44 -0700
committerStan Hu <stanhu@gmail.com>2016-04-19 05:44:44 -0700
commit60b5b22241046498c53a0ddb8509b4ebbf2b9315 (patch)
tree7ff6b9a2c893557b1369525c663b3daeee59b365
parentbfa16dbcfba2a3233209f6403a0074d42e664df6 (diff)
downloadgitlab-ce-60b5b22241046498c53a0ddb8509b4ebbf2b9315.tar.gz
Update Sidekiq and related gems (bundle update sidekiq)
Closes #15079
-rw-r--r--Gemfile.lock7
1 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 958824f7ed9..1589f226d35 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)
@@ -627,7 +627,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)
@@ -734,10 +734,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)