Manual upstream GitLab merge

Conflict resolution was instructive.

No change in GitLab Shell version, change in Gitaly does not affect Heptapod.

Merge request reports

Loading