diff options
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | activejob/Rakefile | 3 | 
2 files changed, 5 insertions, 6 deletions
| diff --git a/Gemfile.lock b/Gemfile.lock index 22418fa5e6..15b7aeb639 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,10 +148,10 @@ GEM      daemons (1.2.4)      dalli (2.7.6)      dante (0.2.0) -    delayed_job (4.1.2) -      activesupport (>= 3.0, < 5.1) -    delayed_job_active_record (4.1.1) -      activerecord (>= 3.0, < 5.1) +    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)      em-hiredis (0.3.1)        eventmachine (~> 1.0) diff --git a/activejob/Rakefile b/activejob/Rakefile index 43e284d090..dd03ab0b8f 100644 --- a/activejob/Rakefile +++ b/activejob/Rakefile @@ -1,8 +1,7 @@  require "rake/testtask"  #TODO: add qu back to the list after it support Rails 5.1 -#TODO: add delayed_job back to the list after it support Rails 5.1 -ACTIVEJOB_ADAPTERS = %w(async inline que queue_classic resque sidekiq sneakers sucker_punch backburner test) +ACTIVEJOB_ADAPTERS = %w(async inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner test)  ACTIVEJOB_ADAPTERS.delete("queue_classic") if defined?(JRUBY_VERSION)  task default: :test | 
