diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-01 17:24:37 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-01 17:24:37 +0200 |
| commit | d3ddc69b54a70fbd2332a21d18babd55f240e5a6 (patch) | |
| tree | 950635b11548983cb1b82103173dc02b1b259c59 /app/models/repository.rb | |
| parent | 1a0e176ba1a55005ee04d187e4b20127603373d8 (diff) | |
| download | gitlab-ce-d3ddc69b54a70fbd2332a21d18babd55f240e5a6.tar.gz | |
Add rugged_is_ancestor method
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
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 |