Commit d779f67c authored by Lin Jen-Shin's avatar Lin Jen-Shin Committed by Douwe Maan

Use GitOperationService instead

parent 9c4f82ab
......@@ -1002,8 +1002,12 @@ class Repository
raise "Invalid merge target" if our_commit.nil?
raise "Invalid merge source" if their_commit.nil?
update_branch_with_hooks(user, target_branch) do
merge_request.update(in_progress_merge_commit_sha: their_commit.oid) if merge_request
GitOperationService.new(user, self).with_branch(
target_branch) do |start_commit|
if merge_request
merge_request.update(in_progress_merge_commit_sha: their_commit.oid)
end
their_commit.oid
end
end
......
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