diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-03 12:44:57 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-03 12:45:53 +0100 |
| commit | ce09dc31827e36fa0bd26c939a81bdb710e1fb93 (patch) | |
| tree | f564f4aafed8b95c6153ea6b9fcba019aac4c65d | |
| parent | 48dacd5e74d17db6c058ea79301d237330980b0e (diff) | |
| download | gitlab-ce-fix-encoding-method-lookup.tar.gz | |
Fix method lookupfix-encoding-method-lookup
| -rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index 1e631e4bd3d..40f032cf873 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -1,6 +1,8 @@ module Gitlab module GitalyClient class ConflictsService + include Gitlab::EncodingHelper + MAX_MSG_SIZE = 128.kilobytes.freeze def initialize(repository, our_commit_oid, their_commit_oid) @@ -22,7 +24,7 @@ module Gitlab end def resolve_conflicts(target_repository, resolution, source_branch, target_branch) - reader = GitalyClient.binary_stringio(resolution.files.to_json) + reader = binary_stringio(resolution.files.to_json) req_enum = Enumerator.new do |y| header = resolve_conflicts_request_header(target_repository, resolution, source_branch, target_branch) |