From c33b534352528070b4b7ffd41ef4b5b42b1cec1d Mon Sep 17 00:00:00 2001
From: MAEDA Go <maeda@farend.jp>
Date: Tue, 7 Apr 2026 11:21:37 +0900
Subject: [PATCH] Optimize `Issue#visible_journals_with_index` preload behavior

---
 app/models/issue.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index b4113b9fe..17d8fdb39 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -918,9 +918,11 @@ class Issue < ApplicationRecord
   # Returns the journals that are visible to user with their index
   # Used to display the issue history
   def visible_journals_with_index(user=User.current)
+    preloads = [:details, :updated_by]
+    preloads << (Setting.gravatar_enabled? ? {user: :email_address} : :user)
+
     result = journals.
-      preload(:details).
-      preload(:user => :email_address).
+      preload(*preloads).
       reorder(:created_on, :id).
       to_a
 
-- 
2.50.1