From 6302de458d07c9ceca49b927922f2b723ddbcdbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 20 Apr 2013 10:37:22 +0200
Subject: [PATCH] bump sidekiq
---
Gemfile | 4 +++-
Gemfile.lock | 9 ++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 4b02cff17d..943e3c2993 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,9 @@ gem 'devise', '2.1.3'
# Background processing
-gem 'sidekiq', '2.10.0'
+gem 'sidekiq', '2.10.1'
+gem 'sinatra', '1.3.3'
+gem 'slim', '1.3.8'
# Configuration
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d3f65944e..13b68b4e6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -348,15 +348,12 @@ GEM
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
- sidekiq (2.10.0)
+ sidekiq (2.10.1)
celluloid (~> 0.12.0)
connection_pool (~> 1.0)
- i18n
multi_json (~> 1)
redis (~> 3)
redis-namespace
- sinatra
- slim
simple_oauth (0.2.0)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
@@ -473,7 +470,9 @@ DEPENDENCIES
ruby-oembed (= 0.8.8)
sass-rails (= 3.2.6)
selenium-webdriver (= 2.32.1)
- sidekiq (= 2.10.0)
+ sidekiq (= 2.10.1)
+ sinatra (= 1.3.3)
+ slim (= 1.3.8)
spork (= 1.0.0rc3)
timecop (= 0.6.1)
twitter (= 4.6.2)
--
GitLab