diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-05-28 00:23:45 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 16:08:55 +0300 |
| commit | 6953b13c060fc6df56339692eb4acb8122193d03 (patch) | |
| tree | 91d52e28bb017cd6630b98cbaa2236829debe62d /app | |
| parent | c5e5d4aa8c95bf668cb65f20d285d625c1fa4e8f (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |