Skip to content

G
gitlab-ce
Commit 8d8550c7 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files
Options

Fix method lookup

parent 8cf0ea44
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
lib/gitlab/gitaly_client/conflicts_service.rb
View file @ 8d8550c7
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 ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7