diff --git a/app/models/journal.rb b/app/models/journal.rb index 1874feb0c..f89464276 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -54,7 +54,9 @@ class Journal < ApplicationRecord :author_key => :user_id, :scope => proc do - preload({:issue => :project}, {:issue => :tracker}, :user). + preloads = [{:issue => :project}, {:issue => :tracker}, :details] + preloads << (Setting.gravatar_enabled? ? {user: :email_address} : :user) + preload(*preloads). joins("LEFT OUTER JOIN #{JournalDetail.table_name} ON #{JournalDetail.table_name}.journal_id = #{Journal.table_name}.id"). where("#{Journal.table_name}.journalized_type = 'Issue' AND" + " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')").distinct