From eb98aeb29644c22bc664543d2bdb929f4a3dae2b Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 23 Dec 2017 21:05:38 +0900
Subject: Use `delayed_job` master

For pass Active Job integration tests with Ruby 2.5.
Ref: https://github.com/collectiveidea/delayed_job/pull/996
---
 Gemfile      |  2 +-
 Gemfile.lock | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index af6e43d173..8c5d1bb22a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ group :job do
   gem "resque-scheduler", require: false
   gem "sidekiq", require: false
   gem "sucker_punch", require: false
-  gem "delayed_job", require: false
+  gem "delayed_job", require: false, github: "collectiveidea/delayed_job"
   gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
   gem "sneakers", require: false
   gem "que", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 8dc20f1ad3..a4f24600c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,13 @@ GIT
     queue_classic (3.2.0.RC1)
       pg (>= 0.17, < 0.20)
 
+GIT
+  remote: https://github.com/collectiveidea/delayed_job.git
+  revision: 6cf9b0b2c256d20148172d074ca60e13d6439903
+  specs:
+    delayed_job (4.1.3)
+      activesupport (>= 3.0, < 5.2)
+
 GIT
   remote: https://github.com/matthewd/rb-inotify.git
   revision: 856730aad4b285969e8dd621e44808a7c5af4242
@@ -201,8 +208,6 @@ GEM
     dante (0.2.0)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    delayed_job (4.1.3)
-      activesupport (>= 3.0, < 5.2)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
@@ -513,7 +518,7 @@ DEPENDENCIES
   chromedriver-helper
   coffee-rails
   dalli (>= 2.2.1)
-  delayed_job
+  delayed_job!
   delayed_job_active_record
   google-cloud-storage (~> 1.8)
   hiredis
-- 
cgit v1.2.3