Skip to content

Draft: Check for merged_commit_sha in merge train history

Hordur Freyr Yngvason requested to merge check-for-merged-commit-sha-in-merge-train-history into master

What does this MR do and why?

We have added a new column merged_commit_sha to merge_requests that represents any merged commit SHA, regardless of merge method. This is necessary to decide whether a fast-forward merge train needs to be rebuilt when a branch is updated, because there will not be a merge commit, and there might not be a squash commit.

This addition does not affect the query performance, since the database first picks out the merge requests for the 20 completed cars, and then scans over the resulting 20 MRs for the provided SHAs.

Part of #418822 (closed)

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Hordur Freyr Yngvason

Merge request reports