From 298c81c00f951241f026b0b3f711ead405b78fbe Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Thu, 8 Feb 2018 23:33:23 +0900
Subject: [PATCH] Clear account cache of notification target_status (#6442)
---
app/models/notification.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 733f89cf79..7f8dae5ec7 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -69,7 +69,7 @@ class Notification < ApplicationRecord
class << self
def reload_stale_associations!(cached_items)
- account_ids = cached_items.map(&:from_account_id).uniq
+ account_ids = (cached_items.map(&:from_account_id) + cached_items.map { |item| item.target_status&.account_id }.compact).uniq
return if account_ids.empty?
@@ -77,6 +77,7 @@ class Notification < ApplicationRecord
cached_items.each do |item|
item.from_account = accounts[item.from_account_id]
+ item.target_status.account = accounts[item.target_status.account_id] if item.target_status
end
end
--
GitLab