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

Disable two_step_rebase feature flag

Browse source 
Disabling because of https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
This commit is contained in:
Douwe Maan 2019-05-27 21:23:44 +00:00 committed by Mayra Cabrera
parent 871e2e1e5f
commit 65cfba2d99
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