kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-encoding-method-lookup' into 'master' 

Fix method lookup

See merge request gitlab-org/gitlab-ce!16191
This commit is contained in:
Grzegorz Bizon 2018-01-03 12:45:15 +00:00
parent 48dacd5e74 ce09dc3182
commit e5a9b9a14d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/gitaly_client/conflicts_service.rb
View File

@ -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)