Skip to content

Commit 6f912a5

Browse files
authored
Merge pull request rails#55399 from bensheldon/unnecessary-config-delete
Remove unnecessary configuration mutation in Active Storage and Active Support railties
2 parents 08b54b9 + 7c525f4 commit 6f912a5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

activestorage/lib/active_storage/engine.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ class Engine < Rails::Engine # :nodoc:
174174
end
175175
end
176176

177-
initializer "active_storage.services" do
177+
initializer "active_storage.services" do |app|
178178
ActiveSupport.on_load(:active_storage_blob) do
179-
configs = Rails.configuration.active_storage.service_configurations ||=
179+
configs = app.config.active_storage.service_configurations ||=
180180
begin
181181
config_file = Rails.root.join("config/storage/#{Rails.env}.yml")
182182
config_file = Rails.root.join("config/storage.yml") unless config_file.exist?
@@ -187,7 +187,7 @@ class Engine < Rails::Engine # :nodoc:
187187

188188
ActiveStorage::Blob.services = ActiveStorage::Service::Registry.new(configs)
189189

190-
if config_choice = Rails.configuration.active_storage.service
190+
if config_choice = app.config.active_storage.service
191191
ActiveStorage::Blob.service = ActiveStorage::Blob.services.fetch(config_choice)
192192
end
193193
end
@@ -209,7 +209,7 @@ class Engine < Rails::Engine # :nodoc:
209209
initializer "action_view.configuration" do
210210
config.after_initialize do |app|
211211
ActiveSupport.on_load(:action_view) do
212-
multiple_file_field_include_hidden = app.config.active_storage.delete(:multiple_file_field_include_hidden)
212+
multiple_file_field_include_hidden = app.config.active_storage.multiple_file_field_include_hidden
213213

214214
unless multiple_file_field_include_hidden.nil?
215215
ActionView::Helpers::FormHelper.multiple_file_field_include_hidden = multiple_file_field_include_hidden

activesupport/lib/active_support/railtie.rb

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

1616
initializer "active_support.isolation_level" do |app|
1717
config.after_initialize do
18-
if level = app.config.active_support.delete(:isolation_level)
18+
if level = app.config.active_support.isolation_level
1919
ActiveSupport::IsolatedExecutionState.isolation_level = level
2020
end
2121
end

0 commit comments

Comments
 (0)