Skip to content

Upgrade Gitaly gem and fix UserSquash RPC usage

What does this MR do?

This change removes usage of the branch field in the UserSquash Gitaly RPC request. Now, the explicit start and ending commits are used to specify what history to squash.

This is a partial cherry pick of !23902 (closed), and an update of the Gitaly gem.

Relates to gitaly#2423 (comment 278446315)

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 Paul Okstad (ex-GitLab)

Merge request reports