summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-10 15:45:36 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2015-12-10 17:18:03 -0200
commit3e5b24d46a7fe904a5f934a54dafbb05a01f837b (patch)
tree476e7887df75c95781a8ca2f00d6f06d9056e069 /Gemfile.lock
parentb20f677baa94aaea1dbc3437c51abbfd6f0e1548 (diff)
downloadgitlab-ce-3e5b24d46a7fe904a5f934a54dafbb05a01f837b.tar.gz
Upgraded Sidekiq to 4.xfeature/sidekiq-4
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock16
1 files changed, 9 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 37ba22b7ceb..20084d08d26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,6 +147,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.7.7)
+ concurrent-ruby (1.0.0)
connection_pool (2.2.0)
coveralls (0.8.9)
json (~> 1.8)
@@ -682,15 +683,15 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
- sidekiq (3.5.3)
- celluloid (~> 0.17.2)
+ sidekiq (4.0.1)
+ concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
json (~> 1.0)
redis (~> 3.2, >= 3.2.1)
- redis-namespace (~> 1.5, >= 1.5.2)
- sidekiq-cron (0.3.1)
+ sidekiq-cron (0.4.0)
+ redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
- sidekiq (>= 2.17.3)
+ sidekiq (>= 4.0.0)
simple_oauth (0.1.9)
simplecov (0.10.0)
docile (~> 1.1.0)
@@ -934,6 +935,7 @@ DEPENDENCIES
rblineprof
rdoc (~> 3.6)
redcarpet (~> 3.3.3)
+ redis-namespace
redis-rails (~> 4.0.0)
request_store (~> 1.2.0)
rerun (~> 0.10.0)
@@ -951,8 +953,8 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack
shoulda-matchers (~> 2.8.0)
- sidekiq (~> 3.5.0)
- sidekiq-cron (~> 0.3.0)
+ sidekiq (~> 4.0)
+ sidekiq-cron (~> 0.4.0)
simplecov (~> 0.10.0)
sinatra (~> 1.4.4)
six (~> 0.2.0)