diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2019-03-28 22:05:27 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2019-04-01 21:17:40 +0300 |
| commit | 8c5b3d030210cc2659107ec2633a496165470125 (patch) | |
| tree | 54e1a98cb3c747715e5047de5051ced536740328 /lib/gitlab/gitaly_client/conflicts_service.rb | |
| parent | 57cba4d1e9e9964359a5c55bca6558db0d511d98 (diff) | |
Allow streaming io objects into Gitaly
This allows us to set the encoding of an IO passed without reading it
into memory.
This is useful if we want to stream files into Gitaly. Like we do when
uploading a new file to the repository.
Diffstat (limited to 'lib/gitlab/gitaly_client/conflicts_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index 6304f998563..077b63205a8 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -37,7 +37,7 @@ module Gitlab end def resolve_conflicts(target_repository, resolution, source_branch, target_branch) - reader = binary_stringio(resolution.files.to_json) + reader = binary_io(resolution.files.to_json) req_enum = Enumerator.new do |y| header = resolve_conflicts_request_header(target_repository, resolution, source_branch, target_branch) |