summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-14 17:41:34 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-14 17:41:34 -0400
commitedc9099970788196824059a7ec17cfc0361b963d (patch)
treee4450caaaed4739ba1dcd11e28ae1071596a6d7e
parent87ec6ae3a57b490ccfc9cedb5ad854ac2abd2704 (diff)
downloadgitlab-ce-rs-bump-sidekiq.tar.gz
Bump sidekiq to 3.4.2rs-bump-sidekiq
- https://github.com/mperham/sidekiq/pull/2309 - https://github.com/mperham/sidekiq/issues/2330 - https://github.com/mperham/sidekiq/pull/2422
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock20
2 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index 6933930e253..320fdbe9629 100644
--- a/Gemfile
+++ b/Gemfile
@@ -124,7 +124,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
gem 'slim'
gem 'sinatra', require: nil
-gem 'sidekiq', '~> 3.3'
+gem 'sidekiq', '~> 3.4.2'
gem 'sidetiq', '0.6.3'
# HTTP requests
diff --git a/Gemfile.lock b/Gemfile.lock
index 043364a9689..ecde5b9797b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
- celluloid (0.16.0)
+ celluloid (0.16.1)
timers (~> 4.0.0)
charlock_holmes (0.6.9.4)
cliver (0.3.2)
@@ -112,7 +112,7 @@ GEM
colored (1.2)
colorize (0.5.8)
columnize (0.9.0)
- connection_pool (2.1.0)
+ connection_pool (2.2.0)
coveralls (0.8.2)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
@@ -520,7 +520,7 @@ GEM
redis-activesupport (4.0.0)
activesupport (~> 4)
redis-store (~> 1.1.0)
- redis-namespace (1.5.1)
+ redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
redis-rack (1.5.0)
rack (~> 1.5)
@@ -607,12 +607,12 @@ GEM
sexp_processor (4.4.5)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
- sidekiq (3.3.0)
- celluloid (>= 0.16.0)
- connection_pool (>= 2.0.0)
- json
- redis (>= 3.0.6)
- redis-namespace (>= 1.3.1)
+ sidekiq (3.4.2)
+ celluloid (~> 0.16.0)
+ connection_pool (~> 2.2, >= 2.2.0)
+ json (~> 1.0)
+ redis (~> 3.2, >= 3.2.1)
+ redis-namespace (~> 1.5, >= 1.5.2)
sidetiq (0.6.3)
celluloid (>= 0.14.1)
ice_cube (= 0.11.1)
@@ -846,7 +846,7 @@ DEPENDENCIES
select2-rails (~> 3.5.9)
settingslogic
shoulda-matchers (~> 2.8.0)
- sidekiq (~> 3.3)
+ sidekiq (~> 3.4.2)
sidetiq (= 0.6.3)
simplecov
sinatra