diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-05-27 10:55:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2019-05-27 18:39:14 +0200 |
| commit | 8104eef058da59577de6087f89a67c9600b9449b (patch) | |
| tree | b2d12adb0e0dcb7f0eca0eff3ab25b42d73d4c5a | |
| parent | f9a2c4034f690e4ab9803522110c063d78da8f4d (diff) | |
| download | gitlab-ce-dm-disable-two-step-rebase.tar.gz | |
Disable two_step_rebase feature flagdm-disable-two-step-rebase
Disabling because of https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
| -rw-r--r-- | app/models/repository.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-disable-two-step-rebase.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e05d3dd58ac..d43f991bb3e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -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 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..4f8c0cfb787 --- /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: +author: +type: other |