From af91d6f35bb0c120a1dc737f64457d7b10672ace Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 31 Dec 2015 16:35:02 +1100
Subject: [PATCH] Revert "FEATURE: upgrade sidekiq to version 4.0"

This reverts commit af93a1d94c34c36072f14e1116b5661e0c1aae29.

We need to wait a bit to clean up our internal API usage.
---
 Gemfile      |  3 +--
 Gemfile.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 496191d34ab..e2696e19e82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,10 +37,9 @@ end
 gem 'mail'
 gem 'mime-types', require: 'mime/types/columnar'
 
+#gem 'redis-rails'
 gem 'hiredis'
 gem 'redis', require:  ["redis", "redis/connection/hiredis"]
-# namspace is needed for sidekiq web
-gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b659c816ecd..97c25c3d517 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,9 +63,49 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (6.0.2)
+    celluloid (0.17.1.2)
+      bundler
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.2.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.1.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (>= 4.1.1)
     certified (1.0.0)
     coderay (1.1.0)
-    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
     crass (1.0.2)
     daemons (1.2.3)
@@ -77,6 +117,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.0.2)
     ember-data-source (1.0.0.beta.16.1)
       ember-source (~> 1.8)
     ember-handlebars-template (0.1.5)
@@ -124,6 +165,7 @@ GEM
     highline (1.7.7)
     hike (1.2.3)
     hiredis (0.6.0)
+    hitimes (1.2.3)
     htmlentities (4.3.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -173,6 +215,7 @@ GEM
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mustache (1.0.2)
+    nenv (0.2.0)
     netrc (0.11.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
@@ -302,6 +345,7 @@ GEM
     rspec-html-matchers (0.7.0)
       nokogiri (~> 1)
       rspec (~> 3)
+    rspec-logsplit (0.1.3)
     rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
@@ -338,13 +382,14 @@ GEM
     shoulda-context (1.2.1)
     shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.0.1)
-      concurrent-ruby (~> 1.0)
+    sidekiq (3.5.0)
+      celluloid (~> 0.17.0)
       connection_pool (~> 2.2, >= 2.2.0)
       json (~> 1.0)
       redis (~> 3.2, >= 3.2.1)
-    sidekiq-statistic (1.2.0)
-      sidekiq (>= 3.3.4, < 5)
+      redis-namespace (~> 1.5, >= 1.5.2)
+    sidekiq-statistic (1.1.0)
+      sidekiq (~> 3.3, >= 3.3.4)
     simple-rss (1.3.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -382,6 +427,8 @@ GEM
     thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.8.0)
+    timers (4.1.1)
+      hitimes
     trollop (2.1.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -466,7 +513,6 @@ DEPENDENCIES
   rb-inotify (~> 0.9)
   rbtrace
   redis
-  redis-namespace
   rest-client
   rinku
   rmmseg-cpp