summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/blob.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 15:09:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 15:09:29 +0000
commit209bd8cf1f542f6ba2a069b368a9187faa871e96 (patch)
tree6b77dc8183135b8316cc70c8dbc9c4e7c18cf05a /lib/gitlab/git/blob.rb
parenta9ced7da447785c57477b3d8dbccc73a78cface1 (diff)
downloadgitlab-ce-209bd8cf1f542f6ba2a069b368a9187faa871e96.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git/blob.rb')
-rw-r--r--lib/gitlab/git/blob.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb
index 5579449bf57..1b49d356d29 100644
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
@@ -86,12 +86,8 @@ module Gitlab
# to the caller to limit the number of blobs and blob_size_limit.
#
def batch(repository, blob_references, blob_size_limit: MAX_DATA_DISPLAY_SIZE)
- if Feature.enabled?(:blobs_fetch_in_batches, default_enabled: true)
- blob_references.each_slice(BATCH_SIZE).flat_map do |refs|
- repository.gitaly_blob_client.get_blobs(refs, blob_size_limit).to_a
- end
- else
- repository.gitaly_blob_client.get_blobs(blob_references, blob_size_limit).to_a
+ blob_references.each_slice(BATCH_SIZE).flat_map do |refs|
+ repository.gitaly_blob_client.get_blobs(refs, blob_size_limit).to_a
end
end