Skip to content

Commit 3d6a7b2

Browse files
committed
Initialize deprecators before configuring them
Since engine initializers run later in the process, we need to run this initializer earlier than the default. This ensures they're all registered before the environments are loaded.
1 parent fae0bae commit 3d6a7b2

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

actioncable/lib/action_cable/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Engine < Rails::Engine # :nodoc:
1010
config.action_cable.mount_path = ActionCable::INTERNAL[:default_mount_path]
1111
config.action_cable.precompile_assets = true
1212

13-
initializer "action_cable.deprecator" do |app|
13+
initializer "action_cable.deprecator", before: :load_environment_config do |app|
1414
app.deprecators[:action_cable] = ActionCable.deprecator
1515
end
1616

actionmailbox/lib/action_mailbox/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Engine < Rails::Engine
2222

2323
config.action_mailbox.storage_service = nil
2424

25-
initializer "action_mailbox.deprecator" do |app|
25+
initializer "action_mailbox.deprecator", before: :load_environment_config do |app|
2626
app.deprecators[:action_mailbox] = ActionMailbox.deprecator
2727
end
2828

actionmailer/lib/action_mailer/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Railtie < Rails::Railtie # :nodoc:
1111
config.action_mailer.preview_paths = []
1212
config.eager_load_namespaces << ActionMailer
1313

14-
initializer "action_mailer.deprecator" do |app|
14+
initializer "action_mailer.deprecator", before: :load_environment_config do |app|
1515
app.deprecators[:action_mailer] = ActionMailer.deprecator
1616
end
1717

actionpack/lib/action_controller/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Railtie < Rails::Railtie # :nodoc:
1717
config.eager_load_namespaces << AbstractController
1818
config.eager_load_namespaces << ActionController
1919

20-
initializer "action_controller.deprecator" do |app|
20+
initializer "action_controller.deprecator", before: :load_environment_config do |app|
2121
app.deprecators[:action_controller] = ActionController.deprecator
2222
end
2323

actionpack/lib/action_dispatch/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Railtie < Rails::Railtie # :nodoc:
4141

4242
config.eager_load_namespaces << ActionDispatch
4343

44-
initializer "action_dispatch.deprecator" do |app|
44+
initializer "action_dispatch.deprecator", before: :load_environment_config do |app|
4545
app.deprecators[:action_dispatch] = ActionDispatch.deprecator
4646
end
4747

actiontext/lib/action_text/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Engine < Rails::Engine
1919
#{root}/app/models
2020
)
2121

22-
initializer "action_text.deprecator" do |app|
22+
initializer "action_text.deprecator", before: :load_environment_config do |app|
2323
app.deprecators[:action_text] = ActionText.deprecator
2424
end
2525

actionview/lib/action_view/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Railtie < Rails::Engine # :nodoc:
7373
end
7474
end
7575

76-
initializer "action_view.deprecator" do |app|
76+
initializer "action_view.deprecator", before: :load_environment_config do |app|
7777
app.deprecators[:action_view] = ActionView.deprecator
7878
end
7979

activejob/lib/active_job/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Railtie < Rails::Railtie # :nodoc:
1010
config.active_job.custom_serializers = []
1111
config.active_job.log_query_tags_around_perform = true
1212

13-
initializer "active_job.deprecator" do |app|
13+
initializer "active_job.deprecator", before: :load_environment_config do |app|
1414
app.deprecators[:active_job] = ActiveJob.deprecator
1515
end
1616

activemodel/lib/active_model/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Railtie < Rails::Railtie # :nodoc:
99

1010
config.active_model = ActiveSupport::OrderedOptions.new
1111

12-
initializer "active_model.deprecator" do |app|
12+
initializer "active_model.deprecator", before: :load_environment_config do |app|
1313
app.deprecators[:active_model] = ActiveModel.deprecator
1414
end
1515

activerecord/lib/active_record/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Railtie < Rails::Railtie # :nodoc:
7575
require "active_record/base"
7676
end
7777

78-
initializer "active_record.deprecator" do |app|
78+
initializer "active_record.deprecator", before: :load_environment_config do |app|
7979
app.deprecators[:active_record] = ActiveRecord.deprecator
8080
end
8181

0 commit comments

Comments
 (0)