From 5e0d451966cb0032597e8ac09a04f38c2250fb6f Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Fri, 8 Jan 2021 15:11:52 +0200 Subject: [PATCH] Unite Active Storage configs in `load_defaults '6.1'` into one if-section When I was comparing 'defaults' for 6.1 in this method and our configuring guide, I was confused that some active_storage options are missing. This change doesn't bring any implementation changes and feels like a cosmetic change. Please feel free to close this if you think so and don't see that we could benefit this change. --- railties/lib/rails/application/configuration.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 86d565a6a78d0..eb6e7ab13a2e3 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -163,10 +163,6 @@ def load_defaults(target_version) active_record.legacy_connection_handling = false end - if respond_to?(:active_storage) - active_storage.track_variants = true - end - if respond_to?(:active_job) active_job.retry_jitter = 0.15 active_job.skip_after_callbacks_if_terminated = true @@ -187,6 +183,8 @@ def load_defaults(target_version) end if respond_to?(:active_storage) + active_storage.track_variants = true + active_storage.queues.analysis = nil active_storage.queues.purge = nil end