From 2b2f4e44e5ffd8f0eab015b6371eb244ab6b7bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 1 Jun 2014 14:29:22 +0200
Subject: [PATCH] bump sidekiq

---
 Changelog.md | 8 ++++++++
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b0c5900a4..b735f0bd9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,13 @@
 # Head
 
+## Major Sidekiq update
+This release includes a major upgrade of the background processing system Sidekiq. To upgrade cleanly:
+
+1. Stop diaspora*
+2. Run `RAILS_ENV=production bundle exec sidekiq` and wait 5-10 minutes, then stop it again (hit `CTRL+C`)
+3. Do a normal upgrade of diaspora*
+4. Start diaspora*
+
 ## Rails 4 - Manual action required
 Please edit `config/initializers/secret_token.rb`, replacing `secret_token` with
 `secret_key_base`.
diff --git a/Gemfile b/Gemfile
index 446db2647..030950d35 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
 
 # Background processing
 
-gem 'sidekiq', '2.17.7'
+gem 'sidekiq', '3.2.2'
 gem 'sinatra', '1.3.3'
 
 # Compression
diff --git a/Gemfile.lock b/Gemfile.lock
index a1815d67c..84d5dd2be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -426,9 +426,9 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    sidekiq (2.17.7)
+    sidekiq (3.2.2)
       celluloid (>= 0.15.2)
-      connection_pool (>= 1.0.0)
+      connection_pool (>= 2.0.0)
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
@@ -574,7 +574,7 @@ DEPENDENCIES
   ruby-oembed (= 0.8.10)
   sass-rails (= 4.0.3)
   selenium-webdriver (= 2.42.0)
-  sidekiq (= 2.17.7)
+  sidekiq (= 3.2.2)
   simple_captcha2 (= 0.3.2)
   sinatra (= 1.3.3)
   sinon-rails (= 1.10.3)