Persist `squash_commit_sha` when squashing
What does this MR do?
- Contributes to #21686 (closed)
- Feature flag: #294243 (closed)
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
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
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