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 /lib/gitlab/git | |
| 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 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 4218e812146..9df04372cc2 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -382,9 +382,9 @@ module Gitlab end # Returns the SHA of the most recent common ancestor of +from+ and +to+ - def merge_base(from, to) + def merge_base(*commits) wrapped_gitaly_errors do - gitaly_repository_client.find_merge_base(from, to) + gitaly_repository_client.find_merge_base(*commits) end end |