Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index 267107e04e6..11eb0a584ab 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -16,7 +16,7 @@ module Gitlab
       SERIALIZE_KEYS = [
         :id, :message, :parent_ids,
         :authored_date, :author_name, :author_email,
-        :committed_date, :committer_name, :committer_email, :trailers
+        :committed_date, :committer_name, :committer_email, :trailers, :referenced_by
       ].freeze
 
       attr_accessor(*SERIALIZE_KEYS)
@@ -414,6 +414,7 @@ module Gitlab
         @committer_email = commit.committer.email.dup
         @parent_ids = Array(commit.parent_ids)
         @trailers = commit.trailers.to_h { |t| [t.key, t.value] }
+        @referenced_by = Array(commit.referenced_by)
       end
 
       # Gitaly provides a UNIX timestamp in author.date.seconds, and a timezone
@@ -463,7 +464,8 @@ module Gitlab
       end
 
       def fetch_body_from_gitaly
-        self.class.get_message(@repository, id)
+        # #to_s is required to ensure BatchLoader is not returned.
+        self.class.get_message(@repository, id).to_s
       end
 
       def self.valid?(commit_id)