From dca5596f997b863a2de6a0fe1ed2c26a9f027359 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sun, 1 Jul 2018 13:22:44 +0200 Subject: 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. --- activejob/lib/active_job/enqueuing.rb | 2 ++ activejob/lib/active_job/execution.rb | 1 + 2 files changed, 3 insertions(+) (limited to 'activejob/lib/active_job') 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 -- cgit v1.2.3