diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-10 17:56:29 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-30 16:06:31 +0200 |
| commit | 1ea0ce827a619007c69010da512cb4e82224ed0f (patch) | |
| tree | 8e12bae451cc61eade1b9773bc4dbb162c53e3bc /app/models/repository.rb | |
| parent | 3e1fb2a54052ca8a7483e788b70380b5c1768c71 (diff) | |
| download | gitlab-ce-1ea0ce827a619007c69010da512cb4e82224ed0f.tar.gz | |
Make GitLab use Gitaly for commit_is_ancestor
- Migration in Repository#is_ancestor?
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 6ab04440ca8..596650353fc 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -981,7 +981,13 @@ class Repository end def is_ancestor?(ancestor_id, descendant_id) - merge_base(ancestor_id, descendant_id) == ancestor_id + Gitlab::GitalyClient.migrate(:is_ancestor) do |is_enabled| + if is_enabled + raw_repository.is_ancestor?(ancestor_id, descendant_id) + else + merge_base_commit(ancestor_id, descendant_id) == ancestor_id + end + end end def empty_repo? |