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:44:57 +0100 |
| commit | 8d8550c78ba0b7d6ac4a26b77b9b2def203d4eec (patch) | |
| tree | c1fb8494209d95553701463ede26cfb78de8f3b4 | |
| parent | 8cf0ea4469290815daa1d64c4f3e16cbba8c00c1 (diff) | |
| download | gitlab-ce-8d8550c78ba0b7d6ac4a26b77b9b2def203d4eec.tar.gz | |
Fix 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) |