Skip to content

Commit 86fd8d0

Browse files
authored
Merge pull request rails#44340 from matthewd/defer-xmlmini
Defer loading XmlMini until it's needed
2 parents 5e91bc4 + e28c4e5 commit 86fd8d0

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

activejob/test/adapters/delayed_job.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
ActiveJob::Base.queue_adapter = :delayed_job
44

55
$LOAD_PATH << File.expand_path("../support/delayed_job", __dir__)
6+
require "active_support/core_ext/kernel/reporting"
67

78
Delayed::Worker.delay_jobs = false
89
Delayed::Worker.backend = :test

activerecord/test/cases/helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
require "cases/test_case"
99
require "active_support/dependencies"
1010
require "active_support/logger"
11+
require "active_support/core_ext/kernel/reporting"
1112
require "active_support/core_ext/kernel/singleton_class"
1213

1314
require "support/config"

activesupport/lib/active_support/core_ext/array/conversions.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "active_support/xml_mini"
43
require "active_support/core_ext/hash/keys"
54
require "active_support/core_ext/string/inflections"
65
require "active_support/core_ext/object/to_param"

activesupport/lib/active_support/core_ext/hash/conversions.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "active_support/xml_mini"
43
require "active_support/core_ext/object/blank"
54
require "active_support/core_ext/object/to_param"
65
require "active_support/core_ext/object/to_query"

0 commit comments

Comments
 (0)