Merge branch 'master' into glitch-soc/merge-upstream

2021-01-18 13:57:12 +01:00
parent a7a47834e5 e46b50e805
commit e202314a75
18 changed files with 48 additions and 43 deletions
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@ -38,7 +38,7 @@ module CacheConcern
    klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!)

    unless uncached_ids.empty?
-      uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item }
+      uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)

      uncached.each_value do |item|
        Rails.cache.write(item, item)