From 6953b13c060fc6df56339692eb4acb8122193d03 Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Mon, 27 May 2019 21:23:45 +0000 Subject: [PATCH] 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 715d10579c18eb51e67743d047465f49099534b1) 8104eef0 Disable two_step_rebase feature flag dd1fa0c2 Apply suggestion to changelogs/unreleased/dm-disable-two-step-rebase.yml --- app/models/repository.rb | 2 +- changelogs/unreleased/dm-disable-two-step-rebase.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/dm-disable-two-step-rebase.yml diff --git a/app/models/repository.rb b/app/models/repository.rb index be17b54ff12..50bc2127495 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -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 diff --git a/changelogs/unreleased/dm-disable-two-step-rebase.yml b/changelogs/unreleased/dm-disable-two-step-rebase.yml new file mode 100644 index 00000000000..342d61a20d6 --- /dev/null +++ b/changelogs/unreleased/dm-disable-two-step-rebase.yml @@ -0,0 +1,5 @@ +--- +title: Disable two-step rebase which could cause rebases to hang +merge_request: 28778 +author: +type: other -- GitLab