Merge pull request rails#41054 from bogdanvlviv/unify-active_storage-configs-in_load_defaults_6_1

Unite Active Storage configs in `load_defaults '6.1'` into one if-section

Author: kaspth

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