kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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:
Mayra Cabrera 2019-05-27 21:23:45 +00:00
parent 871e2e1e5f 65cfba2d99
commit 715d10579c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/repository.rb
View File

@ -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

5
changelogs/unreleased/dm-disable-two-step-rebase.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Disable two-step rebase which could cause rebases to hang
merge_request: 28778
author:
type: other