From 39a5baa8c88ecb8da21b8ff2ecd788c543a777b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:28:41 +0200
Subject: [PATCH] bump resque

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 616772799..597e848e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ gem 'ruby-oembed', '~> 0.8.7'
 
 # queue
 
-gem 'resque', '1.20.0'
+gem 'resque', '1.22.0'
 gem 'resque-timeout', '1.0.0'
 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bf20bbb98..f91896242 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -368,13 +368,13 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
+    redis (3.0.1)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
     remotipart (1.0.2)
-    resque (1.20.0)
+    resque (1.22.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
+      redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     resque-timeout (1.0.0)
@@ -418,7 +418,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip
     simple_oauth (0.1.8)
-    sinatra (1.3.2)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
@@ -535,7 +535,7 @@ DEPENDENCIES
   rails_autolink
   redcarpet (= 2.1.1)
   remotipart (~> 1.0)
-  resque (= 1.20.0)
+  resque (= 1.22.0)
   resque-timeout (= 1.0.0)
   roxml!
   rpm_contrib (~> 2.1.7)