From ca215ca28d3149e9266e866a2b2976b4648c272b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 21 Sep 2015 12:21:16 +0200
Subject: [PATCH] Sidetiq still isn't celluloid 0.17 compatible

---
 Gemfile      |  4 +--
 Gemfile.lock | 72 ++++++++++------------------------------------------
 2 files changed, 15 insertions(+), 61 deletions(-)

diff --git a/Gemfile b/Gemfile
index bec3c220d..04b76a43a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
 # Background processing
 
-gem "sidekiq", "3.5.0"
+gem "sidekiq", "3.4.2"
 gem "sinatra", "1.4.6"
 
 # Scheduled processing
@@ -208,7 +208,7 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Process management
 
-  gem "eye", "0.8.pre"
+  gem "eye", "0.7"
 
   # Redirects
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ee8c0f6ec..2e365bae0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,55 +83,11 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    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-io (0.17.1)
-      bundler
-      celluloid (>= 0.17.1.1)
-      dotenv
-      nenv
-      nio4r (>= 1.1)
-      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)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.2)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.1.0)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.3.4)
@@ -209,7 +165,6 @@ GEM
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.0.2)
     eco (1.0.0)
       coffee-script
       eco-source
@@ -228,9 +183,9 @@ GEM
     eventmachine (1.0.8)
     excon (0.45.4)
     execjs (2.6.0)
-    eye (0.8.pre)
-      celluloid (~> 0.17.0)
-      celluloid-io (~> 0.17.0)
+    eye (0.7)
+      celluloid (~> 0.16.0)
+      celluloid-io (~> 0.16.0)
       sigar (~> 0.7.3)
       state_machine
       thor
@@ -669,7 +624,6 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-instafail (0.4.0)
       rspec
-    rspec-logsplit (0.1.3)
     rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
@@ -707,8 +661,8 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.5.0)
-      celluloid (~> 0.17.0)
+    sidekiq (3.4.2)
+      celluloid (~> 0.16.0)
       connection_pool (~> 2.2, >= 2.2.0)
       json (~> 1.0)
       redis (~> 3.2, >= 3.2.1)
@@ -755,7 +709,7 @@ GEM
     thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.8.0)
-    timers (4.1.1)
+    timers (4.0.4)
       hitimes
     twitter (5.15.0)
       addressable (~> 2.3)
@@ -822,7 +776,7 @@ DEPENDENCIES
   diaspora-vines (~> 0.2.0.develop)
   diaspora_federation-rails (= 0.0.8)
   entypo-rails (= 2.2.3)
-  eye (= 0.8.pre)
+  eye (= 0.7)
   facebox-rails (= 0.2.0)
   factory_girl_rails (= 4.5.0)
   faraday (= 0.9.1)
@@ -908,7 +862,7 @@ DEPENDENCIES
   sass-rails (= 5.0.4)
   selenium-webdriver (= 2.47.1)
   shoulda-matchers (= 2.8.0)
-  sidekiq (= 3.5.0)
+  sidekiq (= 3.4.2)
   sidetiq (= 0.6.3)
   simple_captcha2 (= 0.3.4)
   simplecov (= 0.10.0)