Commit 65cfba2d authored by Douwe Maan's avatar Douwe Maan Committed by Mayra Cabrera

Disable two_step_rebase feature flag

Disabling because of https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
parent 871e2e1e
......@@ -1077,7 +1077,7 @@ class Repository
end
def rebase(user, merge_request)
if Feature.disabled?(:two_step_rebase, default_enabled: true)
if Feature.disabled?(:two_step_rebase, default_enabled: false)
return rebase_deprecated(user, merge_request)
end
......
---
title: Disable two-step rebase which could cause rebases to hang
merge_request: 28778
author:
type: other
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