From dca06ae075d1b87a5f60313e58c3c3f47596c68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 24 Nov 2014 16:31:22 +0100
Subject: [PATCH] bump sidekiq
---
Gemfile | 2 +-
Gemfile.lock | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Gemfile b/Gemfile
index 63a8e5b592..a85f5fc8cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
# Background processing
-gem 'sidekiq', '3.2.6'
+gem 'sidekiq', '3.3.0'
gem 'sinatra', '1.3.3'
# Scheduled processing
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c3657b926..a962caf180 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,8 +78,8 @@ GEM
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
- celluloid (0.15.2)
- timers (~> 1.1.0)
+ celluloid (0.16.0)
+ timers (~> 4.0.0)
childprocess (0.5.5)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.3)
@@ -99,7 +99,7 @@ GEM
compass-rails (2.0.0)
compass (>= 0.12.2)
configurate (0.2.0)
- connection_pool (2.0.0)
+ connection_pool (2.1.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
cucumber (1.3.17)
@@ -249,6 +249,7 @@ GEM
hashie (3.3.1)
hike (1.2.3)
hiredis (0.5.2)
+ hitimes (1.2.2)
http_accept_language (2.0.2)
http_parser.rb (0.6.0)
i18n (0.6.11)
@@ -488,8 +489,8 @@ GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
- sidekiq (3.2.6)
- celluloid (= 0.15.2)
+ sidekiq (3.3.0)
+ celluloid (>= 0.16.0)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
@@ -526,7 +527,8 @@ GEM
thread_safe (0.3.4)
tilt (1.4.1)
timecop (0.7.1)
- timers (1.1.0)
+ timers (4.0.1)
+ hitimes
twitter (4.8.1)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
@@ -651,7 +653,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.11)
sass-rails (= 4.0.4)
selenium-webdriver (= 2.44.0)
- sidekiq (= 3.2.6)
+ sidekiq (= 3.3.0)
sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.2)
sinatra (= 1.3.3)
--
GitLab