diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-04-25 12:05:24 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-04-25 12:05:24 +0300 |
| commit | e7c494cc08de77a8898a561016bd38abc903a5d8 (patch) | |
| tree | 8911bc0deef5234f2f0ce2ccf73cd242e818640a /lib/gitlab/gitaly_client | |
| parent | 6b90db7d64f404c7785b23dcf7b8e39ff6175423 (diff) | |
| parent | 1885691b035a29948fa009bc505c59a97fb79ae6 (diff) | |
Merge branch 'fix-lazy-blobs-requesting-all-previous-blobs' into 'master'
Ensure that we only request blobs in one batch
Closes #60829
See merge request gitlab-org/gitlab-ce!27625
Diffstat (limited to 'lib/gitlab/gitaly_client')
| -rw-r--r-- | lib/gitlab/gitaly_client/blob_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb index 6b8e58e6199..8ccefb00d20 100644 --- a/lib/gitlab/gitaly_client/blob_service.rb +++ b/lib/gitlab/gitaly_client/blob_service.rb @@ -55,13 +55,13 @@ module Gitlab def get_blobs(revision_paths, limit = -1) return [] if revision_paths.empty? - revision_paths.map! do |rev, path| + request_revision_paths = revision_paths.map do |rev, path| Gitaly::GetBlobsRequest::RevisionPath.new(revision: rev, path: encode_binary(path)) end request = Gitaly::GetBlobsRequest.new( repository: @gitaly_repo, - revision_paths: revision_paths, + revision_paths: request_revision_paths, limit: limit ) |