Commit 6953b13c authored by Mayra Cabrera's avatar Mayra Cabrera Committed by GitLab Release Tools Bot

Merge branch 'dm-disable-two-step-rebase' into 'master'

Disable two_step_rebase feature flag

See merge request gitlab-org/gitlab-ce!28778

(cherry picked from commit 715d1057)

8104eef0 Disable two_step_rebase feature flag
dd1fa0c2 Apply suggestion to changelogs/unreleased/dm-disable-two-step-rebase.yml
parent c5e5d4aa
......@@ -1056,7 +1056,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