Merge pull request collectiveidea#191 from collectiveidea/revert-172-…

…fix/autoload Revert "Fix Rails autoloading"
WellSheet · Mar 26, 2021 · cb5dce5 · cb5dce5
2 parents 001b246 + 0935061
commit cb5dce5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/lib/delayed/backend/active_record/railtie.rb b/lib/delayed/backend/active_record/railtie.rb
diff --git a/lib/delayed_job_active_record.rb b/lib/delayed_job_active_record.rb
@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
+require "active_record"
 require "delayed_job"
+require "delayed/backend/active_record"
 
-if defined?(Rails::Railtie)
-  require "delayed/backend/active_record/railtie"
-else
-  require "active_record"
-  require "delayed/backend/active_record"
-
-  Delayed::Worker.backend = :active_record
-end
+Delayed::Worker.backend = :active_record