Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index 1f914dc95d1..aed132aaca0 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -212,8 +212,9 @@ module Gitlab
           right_commit_id: right_commit_sha
         )
 
-        response = GitalyClient.call(@repository.storage, :diff_service, :diff_stats, request, timeout: GitalyClient.medium_timeout)
-        response.flat_map(&:stats)
+        GitalyClient.streaming_call(@repository.storage, :diff_service, :diff_stats, request, timeout: GitalyClient.medium_timeout) do |response|
+          response.flat_map(&:stats)
+        end
       end
 
       def find_all_commits(opts = {})
@@ -246,8 +247,8 @@ module Gitlab
         request = Gitaly::CommitsByMessageRequest.new(
           repository: @gitaly_repo,
           query: query,
-          revision: revision.to_s.force_encoding(Encoding::ASCII_8BIT),
-          path: path.to_s.force_encoding(Encoding::ASCII_8BIT),
+          revision: encode_binary(revision),
+          path: encode_binary(path),
           limit: limit.to_i,
           offset: offset.to_i
         )