diff options
| author | Vinnie Okada <vincent@gitlab.com> | 2015-01-19 07:24:00 +0300 |
|---|---|---|
| committer | Vinnie Okada <vincent@gitlab.com> | 2015-01-21 07:44:33 +0300 |
| commit | 0eed5cace39fccba57e590c4fb9bea1e1cd8387d (patch) | |
| tree | 1e956377a87977e14188771a49a0169dea4bcdc2 /Gemfile.lock | |
| parent | e3987bb6b150a255a76310cc1eabda8945e2f0cd (diff) | |
Upgrade Sidekiq to 3.3
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d9ba4e3c172..18fae9b7001 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,8 +62,8 @@ GEM activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) charlock_holmes (0.6.9.4) cliver (0.3.2) code_analyzer (0.4.3) @@ -244,6 +244,7 @@ GEM hike (1.2.3) hipchat (1.4.0) httparty + hitimes (1.2.2) html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) @@ -495,12 +496,12 @@ GEM sexp_processor (4.4.0) shoulda-matchers (2.1.0) activesupport (>= 3.0.0) - sidekiq (2.17.8) - celluloid (= 0.15.2) - connection_pool (~> 2.0) + sidekiq (3.3.0) + celluloid (>= 0.16.0) + connection_pool (>= 2.0.0) json - redis (~> 3.1) - redis-namespace (~> 1.3) + redis (>= 3.0.6) + redis-namespace (>= 1.3.1) simple_oauth (0.1.9) simplecov (0.9.0) docile (~> 1.1.0) @@ -555,7 +556,8 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - timers (1.1.0) + timers (4.0.1) + hitimes timfel-krb5-auth (0.8) tinder (1.9.3) eventmachine (~> 1.0) @@ -716,7 +718,7 @@ DEPENDENCIES semantic-ui-sass (~> 0.16.1.0) settingslogic shoulda-matchers (~> 2.1.0) - sidekiq (= 2.17.8) + sidekiq (~> 3.3) simplecov sinatra six |