Commit 57fa8c75 authored by Mayra Cabrera's avatar Mayra Cabrera

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
parents a2c767b9 872b624a
...@@ -1077,7 +1077,7 @@ class Repository ...@@ -1077,7 +1077,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