Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #41054 from bogdanvlviv/unify-active_storage-confi…
…gs-in_load_defaults_6_1

Unite Active Storage configs in `load_defaults '6.1'` into one if-section
  • Loading branch information
kaspth committed Jan 8, 2021
2 parents c97f1f1 + 5e0d451 commit 555aa38
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions railties/lib/rails/application/configuration.rb
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 555aa38

Please sign in to comment.