Commit a5b8a315 authored by Mark Chao's avatar Mark Chao

Remove duplicated can_be_merged? method

parent 97bb3dc6
...@@ -1456,16 +1456,6 @@ module Gitlab ...@@ -1456,16 +1456,6 @@ module Gitlab
output output
end end
def can_be_merged?(source_sha, target_branch)
gitaly_migrate(:can_be_merged) do |is_enabled|
if is_enabled
gitaly_can_be_merged?(source_sha, find_branch(target_branch).target)
else
rugged_can_be_merged?(source_sha, target_branch)
end
end
end
def last_commit_for_path(sha, path) def last_commit_for_path(sha, path)
gitaly_migrate(:last_commit_for_path) do |is_enabled| gitaly_migrate(:last_commit_for_path) do |is_enabled|
if is_enabled if is_enabled
......
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