diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-15 19:18:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-15 19:18:21 +0300 |
| commit | 3c15a20ba33b076eabca0335f91065e7cbe2d08b (patch) | |
| tree | 04252c2488c67f15b89d36a425c8b862cc466a06 /app | |
| parent | 422715b2248535be9521c6499b94090ac90b394c (diff) | |
| parent | 71d71afb3ac5f302470e66ace4f59e247249d99e (diff) | |
Merge branch 'bvl-merge-base-multiple-revisions' into 'master'
Allow getting the merge base of multiple revisions
Closes #52573
See merge request gitlab-org/gitlab-ce!22295
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index a3a3ce179fc..2c28ea64066 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -881,10 +881,12 @@ class Repository delegate :merged_branch_names, to: :raw_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 - raw_repository.merge_base(first_commit_id, second_commit_id) + def merge_base(*commits_or_ids) + commit_ids = commits_or_ids.map do |commit_or_id| + commit_or_id.is_a?(::Commit) ? commit_or_id.id : commit_or_id + end + + raw_repository.merge_base(*commit_ids) end def ancestor?(ancestor_id, descendant_id) |