diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-27 16:26:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 16:26:18 +0100 |
| commit | 33be091f506242b136b0d4a65cf06a0babc4d757 (patch) | |
| tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /app/controllers/application_controller.rb | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff) | |
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 983b116c9..0209805d0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -188,7 +188,7 @@ class ApplicationController < ActionController::Base 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.map { |item| [item.id, item] }.to_h + uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item } uncached.each_value do |item| Rails.cache.write(item, item) |