Commit a1c6d504 authored by Ruben Davila's avatar Ruben Davila

Fix old method name.

parent 7f1fbd12
...@@ -963,7 +963,7 @@ class Repository ...@@ -963,7 +963,7 @@ class Repository
raise "Invalid merge target" if our_commit.nil? raise "Invalid merge target" if our_commit.nil?
raise "Invalid merge source" if their_commit.nil? raise "Invalid merge source" if their_commit.nil?
commit_with_hooks(user, target_branch) do update_branch_with_hooks(user, target_branch) do
merge_request.update(in_progress_merge_commit_sha: their_commit.oid) if merge_request merge_request.update(in_progress_merge_commit_sha: their_commit.oid) if merge_request
their_commit.oid 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