Commit graph

3 commits

Author SHA1 Message Date
GitLab Bot
ae27cd3c88 Add latest changes from gitlab-org/gitlab@master 2021-09-15 12:11:13 +00:00
Mark Chao
c6c53d1c74 Fix commit with two parents is set with wrong direct_ancestor
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.
2018-12-07 21:00:47 +08:00
Mark Chao
1f7647f446 Update merge request's merge_commit for branch update
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
2018-12-07 19:24:34 +08:00