diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-05-27 21:23:45 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-05-27 21:23:45 +0000 |
| commit | 715d10579c18eb51e67743d047465f49099534b1 (patch) | |
| tree | 7b1557a1698f240417b11b740dabefc3912efcff | |
| parent | 871e2e1e5ffbe4e6253a52b661aac8143655cdf5 (diff) | |
| parent | 65cfba2d99c5369ef91d146a064d0da01bb6cf21 (diff) | |
| download | gitlab-ce-715d10579c18eb51e67743d047465f49099534b1.tar.gz | |
Merge branch 'dm-disable-two-step-rebase' into 'master'
Disable two_step_rebase feature flag
See merge request gitlab-org/gitlab-ce!28778
| -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..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 |