From: Anton Khorev <tony29@yandex.ru>
Date: Tue, 21 Jan 2025 22:05:39 +0000 (+0300)
Subject: Merge branch 'pull/5531'
X-Git-Tag: live~420
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7b19ba580c42f177d295011a136bb38957b475bc?hp=ebe7cf8d171f57f5aa3810141217e9d83873c28c

Merge branch 'pull/5531'
---

diff --git a/app/controllers/users/changeset_comments_controller.rb b/app/controllers/users/changeset_comments_controller.rb
index 2b8b367fe..a690e7c4a 100644
--- a/app/controllers/users/changeset_comments_controller.rb
+++ b/app/controllers/users/changeset_comments_controller.rb
@@ -8,7 +8,7 @@ module Users
 
       @params = params.permit(:display_name, :before, :after)
 
-      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:author])
+      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:author, :changeset])
     end
   end
 end
diff --git a/app/controllers/users/diary_comments_controller.rb b/app/controllers/users/diary_comments_controller.rb
index 8f41e509f..4737ec007 100644
--- a/app/controllers/users/diary_comments_controller.rb
+++ b/app/controllers/users/diary_comments_controller.rb
@@ -8,7 +8,7 @@ module Users
 
       @params = params.permit(:display_name, :before, :after)
 
-      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
+      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user, :diary_entry])
 
       render :partial => "page" if turbo_frame_request_id == "pagination"
     end