diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-02 09:57:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-02 09:57:06 +0000 |
| commit | 30413fd2fffb42424d83c68814a2e8e70bf94671 (patch) | |
| tree | 0360d8f7629b129f516872c0c9a51bbf313217fb /app | |
| parent | c955c3d5bf43b4043a8fad04daa498b9f529cf98 (diff) | |
| parent | d3ddc69b54a70fbd2332a21d18babd55f240e5a6 (diff) | |
| download | gitlab-ce-30413fd2fffb42424d83c68814a2e8e70bf94671.tar.gz | |
Merge branch 'rugged-is-ancestor' into 'master'
Add rugged_is_ancestor method
See merge request !13232
Diffstat (limited to 'app')
| -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 |