diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-03 12:45:15 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-03 12:45:15 +0000 |
| commit | e5a9b9a14d32d890dea20403c977dfd569eb3e17 (patch) | |
| tree | f564f4aafed8b95c6153ea6b9fcba019aac4c65d | |
| parent | 48dacd5e74d17db6c058ea79301d237330980b0e (diff) | |
| parent | ce09dc31827e36fa0bd26c939a81bdb710e1fb93 (diff) | |
| download | gitlab-ce-e5a9b9a14d32d890dea20403c977dfd569eb3e17.tar.gz | |
Merge branch 'fix-encoding-method-lookup' into 'master'
Fix method lookup
See merge request gitlab-org/gitlab-ce!16191
| -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) |