From aff07e8a6ce65f1e77146969aa737b8a775883b2 Mon Sep 17 00:00:00 2001
From: Wedge <shadowpilot34@gmail.com>
Date: Sun, 22 May 2016 22:46:59 +0300
Subject: [PATCH] Another gem fix

---
 Gemfile      |  2 +-
 Gemfile.lock | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3b3c64ceb..9dcd146cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'paperclip'
 gem 'resque'
 gem 'resque-status'
 gem 'resque_mailer'
-gem 'resque-scheduler'
+gem 'resque-scheduler', '~>2.5.4'
 gem 'perform_later', git: 'git://github.com/KensoDev/perform_later.git' # should be after resque_mailer
 gem 'russian'
 gem 'state_machines-activerecord'
diff --git a/Gemfile.lock b/Gemfile.lock
index 28115927b..3e31f1695 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -326,7 +326,7 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redis (3.3.0)
+    redis (3.0.7)
     redis-actionpack (4.0.1)
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
@@ -350,17 +350,17 @@ GEM
     ref (2.0.0)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    resque (1.26.0)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (4.2.0)
+    resque-scheduler (2.5.5)
       mono_logger (~> 1.0)
-      redis (~> 3.0)
-      resque (~> 1.25)
-      rufus-scheduler (~> 3.2)
+      redis (~> 3.0.4)
+      resque (~> 1.25.1)
+      rufus-scheduler (~> 2.0.24)
     resque-status (0.5.0)
       resque (~> 1.19)
     resque_mailer (2.3.0)
@@ -392,7 +392,8 @@ GEM
       sprockets (>= 2.0.0)
     ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    rufus-scheduler (3.2.1)
+    rufus-scheduler (2.0.24)
+      tzinfo (>= 0.3.22)
     russian (0.6.0)
       i18n (>= 0.5.0)
     safe_yaml (1.0.4)
@@ -585,7 +586,7 @@ DEPENDENCIES
   redis-rails
   redis-semaphore
   resque
-  resque-scheduler
+  resque-scheduler (~> 2.5.4)
   resque-status
   resque_mailer
   rest-client