Merge remote-tracking branch 'upstream/pull/5588'

[rails.git] / app / controllers / users / diary_comments_controller.rb

diff --git a/app/controllers/users/diary_comments_controller.rb b/app/controllers/users/diary_comments_controller.rb
index 8f41e509f365a59fa17c078b19fc513ce843105b..4737ec0071db66ebb81b5cb0f55d46e34dd267bd 100644 (file)
--- 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