Merge branch 'fix-encoding-method-lookup' into 'master'
Fix method lookup See merge request gitlab-org/gitlab-ce!16191
This commit is contained in:
commit
e5a9b9a14d
|
@ -1,6 +1,8 @@
|
||||||
module Gitlab
|
module Gitlab
|
||||||
module GitalyClient
|
module GitalyClient
|
||||||
class ConflictsService
|
class ConflictsService
|
||||||
|
include Gitlab::EncodingHelper
|
||||||
|
|
||||||
MAX_MSG_SIZE = 128.kilobytes.freeze
|
MAX_MSG_SIZE = 128.kilobytes.freeze
|
||||||
|
|
||||||
def initialize(repository, our_commit_oid, their_commit_oid)
|
def initialize(repository, our_commit_oid, their_commit_oid)
|
||||||
|
@ -22,7 +24,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def resolve_conflicts(target_repository, resolution, source_branch, target_branch)
|
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|
|
req_enum = Enumerator.new do |y|
|
||||||
header = resolve_conflicts_request_header(target_repository, resolution, source_branch, target_branch)
|
header = resolve_conflicts_request_header(target_repository, resolution, source_branch, target_branch)
|
||||||
|
|
Loading…
Reference in New Issue