From 58927d1a9df116b8ac9515a95331269cbf301c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 23 Aug 2014 16:03:17 +0200
Subject: [PATCH] bump sidekiq to 2.17.7
---
Gemfile | 2 +-
Gemfile.lock | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
index a70a99658c..efca53b555 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'galetahub-simple_captcha', '0.1.5', :require => 'simple_captcha'
# Background processing
-gem 'sidekiq', '2.17.2'
+gem 'sidekiq', '2.17.7'
gem 'sinatra', '1.3.3'
# Configuration
diff --git a/Gemfile.lock b/Gemfile.lock
index afd19b8df8..ac931b3000 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
compass (>= 0.12.2)
sprockets (<= 2.11.0)
configurate (0.0.8)
- connection_pool (1.2.0)
+ connection_pool (2.0.0)
crack (0.4.1)
safe_yaml (~> 0.9.0)
cucumber (1.3.15)
@@ -362,9 +362,9 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.1.2)
- redis (3.0.6)
- redis-namespace (1.4.1)
- redis (~> 3.0.4)
+ redis (3.1.0)
+ redis-namespace (1.5.1)
+ redis (~> 3.0, >= 3.0.4)
remotipart (1.2.1)
roxml (3.1.6)
activesupport (>= 2.3.0)
@@ -400,7 +400,7 @@ GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
- sidekiq (2.17.2)
+ sidekiq (2.17.7)
celluloid (>= 0.15.2)
connection_pool (>= 1.0.0)
json
@@ -538,7 +538,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.9)
sass-rails (= 3.2.6)
selenium-webdriver (= 2.42.0)
- sidekiq (= 2.17.2)
+ sidekiq (= 2.17.7)
sinatra (= 1.3.3)
sinon-rails (= 1.9.0)
spork (= 1.0.0rc4)
--
GitLab