Stop two-step rebase from hanging when errors occur
Bumps Gitaly to include gitaly!1270 (merged) and reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28778. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/62353.
Edited by Douwe Maan