How to handle Gitaly Security merge requests?
Gitaly security issues are rare and not automatically embedded in the security release process. There composed of two sections:
- The Gitaly security fix prepared on the Gitaly security repository and,
- The merge request that bumps the Gitaly version on GitLab, prepared on the GitLab security repository.
The first part is prepared by the Gitaly team, the second part requires manual intervention by Release Manager, this last part aims to be automated by performing the Gitaly update task during the Security Release.
Once the Gitaly security merge requests are ready:
- Merge the security merge request targeting
master
on the Gitaly repository. - Bump the
GITALY_VERSION
on the GitLab security repository by using the merge sha from the Gitaly security merge request (see example) - Disable the automatic Gitaly update task.
- Prior to merging the backports, ensure the merge request that bumps the version has been deployed to GitLab.com.
After the security release is published, re-enable the Gitaly update task.