summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-11-28 19:06:21 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-12-04 18:11:49 +0100
commit18164afbccf90074abf55e2bcdb91204b213ede1 (patch)
treea015c739f439b33aa520821ae979f1f73844a8c4 /Gemfile.lock
parentd7fa9952efef4316cdaa1c7c86c4b8c2c6703bc7 (diff)
downloadgitlab-ce-18164afbccf90074abf55e2bcdb91204b213ede1.tar.gz
Update Sidekiq to 2.17.8
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock20
1 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7871f49d0bf..4bcb1eb0de5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
coffee-script-source (1.6.3)
colored (1.2)
colorize (0.5.8)
- connection_pool (1.2.0)
+ connection_pool (2.1.0)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
@@ -402,7 +402,7 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.1.2)
- redis (3.0.6)
+ redis (3.1.0)
redis-actionpack (4.0.0)
actionpack (~> 4)
redis-rack (~> 1.5.0)
@@ -410,8 +410,8 @@ GEM
redis-activesupport (4.0.0)
activesupport (~> 4)
redis-store (~> 1.1.0)
- redis-namespace (1.4.1)
- redis (~> 3.0.4)
+ redis-namespace (1.5.1)
+ redis (~> 3.0, >= 3.0.4)
redis-rack (1.5.0)
rack (~> 1.5)
redis-store (~> 1.1.0)
@@ -470,12 +470,12 @@ GEM
sexp_processor (4.4.0)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
- sidekiq (2.17.0)
- celluloid (>= 0.15.2)
- connection_pool (>= 1.0.0)
+ sidekiq (2.17.8)
+ celluloid (= 0.15.2)
+ connection_pool (~> 2.0)
json
- redis (>= 3.0.4)
- redis-namespace (>= 1.3.1)
+ redis (~> 3.1)
+ redis-namespace (~> 1.3)
simple_oauth (0.1.9)
simplecov (0.9.0)
docile (~> 1.1.0)
@@ -684,7 +684,7 @@ DEPENDENCIES
semantic-ui-sass (~> 0.16.1.0)
settingslogic
shoulda-matchers (~> 2.1.0)
- sidekiq (= 2.17.0)
+ sidekiq (= 2.17.8)
simplecov
sinatra
six