Skip to content

Persist `squash_commit_sha` when squashing

Vasilii Iakliushin requested to merge 21686_persist_squash_commit_sha into master

What does this MR do?

Problem

We already populate squash_commit_sha field for fast forward merges, however for regular merges with squashing we keep this field empty.

Solution

Persist squash commit sha in the database when merging with squash option is enabled.


It is a first step to resolve the problem with missing relation between merge requests and squashed commits.

Next MR (!49968 (merged)) will start using squash_commit_sha for filtering.

Screenshots (strongly suggested)

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 Vasilii Iakliushin

Merge request reports