Merge branch 'zj-bump-gitaly-master' into 'master'
Stop two-step rebase from hanging when errors occur Closes #62353 See merge request gitlab-org/gitlab-ce!29068
Stop two-step rebase from hanging when errors occur Closes #62353 See merge request gitlab-org/gitlab-ce!29068