Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-08-01 18:24:37 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-08-01 18:24:37 +0300
commitd3ddc69b54a70fbd2332a21d18babd55f240e5a6 (patch)
tree950635b11548983cb1b82103173dc02b1b259c59 /app/models/repository.rb
parent1a0e176ba1a55005ee04d187e4b20127603373d8 (diff)
Add rugged_is_ancestor method
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7ea9f1459a0..4e9fe759fdc 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -944,7 +944,7 @@ class Repository
if is_enabled
raw_repository.is_ancestor?(ancestor_id, descendant_id)
else
- merge_base_commit(ancestor_id, descendant_id) == ancestor_id
+ rugged_is_ancestor?(ancestor_id, descendant_id)
end
end
end