1.42.0
1.42.3
......@@ -1056,7 +1056,7 @@ class Repository
end
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)
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