From: Tom Hughes <tom@compton.nu>
Date: Sat, 2 Sep 2023 10:47:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4214'
X-Git-Tag: live~1879
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9693a0966479f642bc55f93205fea1483675255c?hp=d2bdf1f0ae786597017439ac8d48590609d83e69

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

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index e6f391ede..c489f96be 100644
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -251,7 +251,9 @@ module Api
       end
 
       # Find the comments we want to return
-      @comments = NoteComment.where(:note => notes).order("created_at DESC").limit(result_limit).preload(:note)
+      @comments = NoteComment.where(:note => notes)
+                             .order(:created_at => :desc).limit(result_limit)
+                             .preload(:author, :note => { :comments => :author })
 
       # Render the result
       respond_to do |format|