Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ce09dc31
Commit
ce09dc31
authored
Jan 03, 2018
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix method lookup
parent
48dacd5e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
lib/gitlab/gitaly_client/conflicts_service.rb
lib/gitlab/gitaly_client/conflicts_service.rb
+3
-1
No files found.
lib/gitlab/gitaly_client/conflicts_service.rb
View file @
ce09dc31
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment