Merge branch 'dm-disable-two-step-rebase' into 'master'
Disable two_step_rebase feature flag See merge request gitlab-org/gitlab-ce!28778
This commit is contained in:
commit
715d10579c
2 changed files with 6 additions and 1 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
5
changelogs/unreleased/dm-disable-two-step-rebase.yml
Normal file
5
changelogs/unreleased/dm-disable-two-step-rebase.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Disable two-step rebase which could cause rebases to hang
|
||||||
|
merge_request: 28778
|
||||||
|
author:
|
||||||
|
type: other
|
Loading…
Reference in a new issue