Commit 9d438edb authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Anchestor check is Gitaly only now

Closes https://gitlab.com/gitlab-org/gitaly/issues/308
parent 2bac2918
...@@ -549,24 +549,9 @@ module Gitlab ...@@ -549,24 +549,9 @@ module Gitlab
end end
end end
# Gitaly note: JV: check gitlab-ee before removing this method.
def rugged_is_ancestor?(ancestor_id, descendant_id)
return false if ancestor_id.nil? || descendant_id.nil?
rugged_merge_base(ancestor_id, descendant_id) == ancestor_id
rescue Rugged::OdbError
false
end
# Returns true is +from+ is direct ancestor to +to+, otherwise false # Returns true is +from+ is direct ancestor to +to+, otherwise false
def ancestor?(from, to) def ancestor?(from, to)
Gitlab::GitalyClient.migrate(:is_ancestor) do |is_enabled| gitaly_commit_client.ancestor?(from, to)
if is_enabled
gitaly_commit_client.ancestor?(from, to)
else
rugged_is_ancestor?(from, to)
end
end
end end
def merged_branch_names(branch_names = []) def merged_branch_names(branch_names = [])
......
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