diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-14 18:58:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-14 18:58:38 +0000 |
| commit | ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e (patch) | |
| tree | 0e6d32bf1368bdc0df58c712bb469bae226af21b /app/models/repository.rb | |
| parent | d7c1a9d9111f4e545155eab2fbdc89ad4925a52f (diff) | |
| parent | 835a5db376a69dce20ba616d480a5a9ab15b2577 (diff) | |
| download | gitlab-ce-ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e.tar.gz | |
Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Closes gitaly#808
See merge request gitlab-org/gitlab-ce!15770
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 0c50d05bd96..552a354d1ce 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -934,7 +934,7 @@ class Repository def merge_base(first_commit_id, second_commit_id) first_commit_id = commit(first_commit_id).try(:id) || first_commit_id second_commit_id = commit(second_commit_id).try(:id) || second_commit_id - rugged.merge_base(first_commit_id, second_commit_id) + raw_repository.merge_base(first_commit_id, second_commit_id) rescue Rugged::ReferenceError nil end |