Use upstream delayed_job_active_record

Author: Vidas P

Gemfile

@@ -49,8 +49,8 @@ gem 'mini_racer', '~> 0.2.6'
 gem 'bootstrap', '~> 4.3.1'
 gem 'bootstrap-kaminari-views', '~> 0.0.5'
 gem 'daemons', '~> 1.2.6'
-gem 'delayed_job', '~> 4.1.7'
-gem 'delayed_job_active_record', github: 'automaticmode/delayed_job_active_record'
+gem 'delayed_job', '~> 4.1.8'
+gem 'delayed_job_active_record', '~> 4.1.4'
 gem 'devise', '~> 4.7.1'
 gem 'dotenv', '~> 2.5.0'
 # TODO: update

Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/automaticmode/delayed_job_active_record.git
-  revision: 8efc7b10a3e899a75515430b2216556f4e6c3de0
-  specs:
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
-      delayed_job (>= 3.0, < 5)
-
 GIT
   remote: https://github.com/erector/erector
   revision: 59754211101b2c50a4c9daa8e64a64e6edc9e976
@@ -136,8 +128,11 @@ GEM
     crass (1.0.4)
     daemons (1.2.6)
     debug_inspector (0.0.3)
-    delayed_job (4.1.7)
-      activesupport (>= 3.0, < 5.3)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)
+      delayed_job (>= 3.0, < 5)
     delorean (2.1.0)
       chronic
     descendants_tracker (0.0.4)
@@ -233,7 +228,7 @@ GEM
     http_parser.rb (0.6.0)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iniparse (1.4.4)
@@ -306,7 +301,7 @@ GEM
     mini_portile2 (2.4.0)
     mini_racer (0.2.6)
       libv8 (>= 6.9.411)
-    minitest (5.11.3)
+    minitest (5.12.2)
     msgpack (1.2.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -603,8 +598,8 @@ DEPENDENCIES
   codecov (~> 0.1.14)
   coffee-rails (~> 4.2.2)
   daemons (~> 1.2.6)
-  delayed_job (~> 4.1.7)
-  delayed_job_active_record!
+  delayed_job (~> 4.1.8)
+  delayed_job_active_record (~> 4.1.4)
   delorean (~> 2.1.0)
   devise (~> 4.7.1)
   dotenv (~> 2.5.0)

config/initializers/delayed_job.rb

@@ -10,7 +10,7 @@
 # Delayed::Worker.logger = Logger.new(Rails.root.join('log', 'delayed_job.log'))
 # Delayed::Worker.logger.level = Logger::DEBUG
 
-ActiveSupport.on_load(:delayed_job_active_record) do
+ActiveSupport.on_load(:active_record) do
   class Delayed::Job
     scope :pending, -> { where('locked_at IS NULL AND attempts = 0') }
     scope :awaiting_retry, -> { where('failed_at IS NULL AND attempts > 0 AND locked_at IS NULL') }