Commit c44d1775 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Mayra Cabrera

Bump Gitaly version to 1.42.3

This change makes sure Gitaly includes a fix to make rebase work again
properly.

Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
parent 6953b13c
...@@ -1056,7 +1056,7 @@ class Repository ...@@ -1056,7 +1056,7 @@ class Repository
end end
def rebase(user, merge_request) def rebase(user, merge_request)
if Feature.disabled?(:two_step_rebase, default_enabled: false) if Feature.disabled?(:two_step_rebase, default_enabled: true)
return rebase_deprecated(user, merge_request) return rebase_deprecated(user, merge_request)
end end
......
---
title: Disable two-step rebase which could cause rebases to hang
merge_request: 28778
author:
type: other
---
title: Stop two-step rebase from hanging when errors occur
merge_request: 29068
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment