diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-07-01 13:22:44 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2018-07-01 13:22:44 +0200 |
| commit | dca5596f997b863a2de6a0fe1ed2c26a9f027359 (patch) | |
| tree | e40f686688723b9970ce40b32d5d7fb348558404 /activejob | |
| parent | 969577d960cd7e2d0a421af4a987f56894c3b229 (diff) | |
| download | rails-dca5596f997b863a2de6a0fe1ed2c26a9f027359.tar.gz rails-dca5596f997b863a2de6a0fe1ed2c26a9f027359.tar.bz2 rails-dca5596f997b863a2de6a0fe1ed2c26a9f027359.zip | |
Revert "Merge pull request #33234 from alpaca-tc/autoload_activejob_arguments"
It breaks Active Job when run in isolation. E.g. bin/test test/cases/logging_test.rb:
https://travis-ci.org/rails/rails/jobs/398779028
Consider Rafaels suggestion of reviewing the eager loading instead:
https://github.com/rails/rails/pull/33234#issuecomment-401027419
This reverts commit cb0fdaacb277bd0595bfd73178329922aa24477e, reversing
changes made to a0a1abb3c7942084111d87ae95837a83bcc794f6.
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/lib/active_job.rb | 1 | ||||
| -rw-r--r-- | activejob/lib/active_job/enqueuing.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/execution.rb | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/activejob/lib/active_job.rb b/activejob/lib/active_job.rb index 69c02098a0..01fab4d918 100644 --- a/activejob/lib/active_job.rb +++ b/activejob/lib/active_job.rb @@ -31,7 +31,6 @@ require "global_id" module ActiveJob extend ActiveSupport::Autoload - autoload :Arguments autoload :Base autoload :QueueAdapters autoload :Serializers diff --git a/activejob/lib/active_job/enqueuing.rb b/activejob/lib/active_job/enqueuing.rb index 66a7919aad..53cb98fc71 100644 --- a/activejob/lib/active_job/enqueuing.rb +++ b/activejob/lib/active_job/enqueuing.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "active_job/arguments" + module ActiveJob # Provides behavior for enqueuing jobs. module Enqueuing diff --git a/activejob/lib/active_job/execution.rb b/activejob/lib/active_job/execution.rb index 8833e798d2..d75be376ec 100644 --- a/activejob/lib/active_job/execution.rb +++ b/activejob/lib/active_job/execution.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "active_support/rescuable" +require "active_job/arguments" module ActiveJob module Execution |