summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/branch_push_merge_commit_analyzer_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-121-0/+1
|
* Fix commit with two parents is set with wrong direct_ancestorMark Chao2018-12-071-0/+19
| | | | | | | | | | If a commit has two parents, one is direct ancestor, and one is not, and the order of `commits` is in such fashion that the non-ancestor side is visited first, the commit would be determined as non-ancestor, when in fact it can be. Therefore we should first determine all direct ancestors prior to analyzing.
* Update merge request's merge_commit for branch updateMark Chao2018-12-071-0/+43
Analyze new commits graph to determine each commit's merge commit. Fix "merged with [commit]" info for merge requests being merged automatically by other actions. Allow analyzing upto the relevant commit