diff --git a/app/models/repository.rb b/app/models/repository.rb index be17b54ff120c93782db83c5a7dc6f1c9a04026b..50bc21274954f3c2c48651547c0ea97d201cd2ea 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 0000000000000000000000000000000000000000..342d61a20d6f815365450d42db47e0046214c711 --- /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