Commit 715d1057 authored by Mayra Cabrera's avatar Mayra Cabrera

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

Disable two_step_rebase feature flag

See merge request gitlab-org/gitlab-ce!28778
parents 871e2e1e 65cfba2d
...@@ -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: true) if Feature.disabled?(:two_step_rebase, default_enabled: false)
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
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