Skip to content

Update squash_commit_sha only on successful merge

What does this MR do?

With !17052 (merged) we started saving and exposing squash commit sha for squash & fast-forward merge requests but we do it even if the merge fails.

This MR fixes this and add tests to ensure we do update the column only if the merge was successful.

Related to #35709 (closed).

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Krasimir Angelov

Merge request reports