Add latest changes from gitlab-org/gitlab@15-7-stable-ee

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index de66ca7305f..e5f8a255f7d 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -78,7 +78,7 @@ module Gitlab
       def commit_deltas(commit)
         request = Gitaly::CommitDeltaRequest.new(diff_from_parent_request_params(commit))
         response = gitaly_client_call(@repository.storage, :diff_service, :commit_delta, request, timeout: GitalyClient.fast_timeout)
-        response.flat_map { |msg| msg.deltas }
+        response.flat_map { |msg| msg.deltas.to_ary }
       end
 
       def tree_entry(ref, path, limit = nil)
diff --git a/lib/gitlab/gitaly_client/ref_service.rb b/lib/gitlab/gitaly_client/ref_service.rb
index da579276101..98b1d3dceef 100644
--- a/lib/gitlab/gitaly_client/ref_service.rb
+++ b/lib/gitlab/gitaly_client/ref_service.rb
@@ -235,7 +235,7 @@ module Gitlab
       end
 
       def consume_list_refs_response(response)
-        response.flat_map(&:references)
+        response.flat_map { |res| res.references.to_ary }
       end
 
       def sort_local_branches_by_param(sort_by)