summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-05-27 21:23:44 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-05-27 21:23:44 +0000
commit65cfba2d99c5369ef91d146a064d0da01bb6cf21 (patch)
tree7b1557a1698f240417b11b740dabefc3912efcff
parent871e2e1e5ffbe4e6253a52b661aac8143655cdf5 (diff)
downloadgitlab-ce-65cfba2d99c5369ef91d146a064d0da01bb6cf21.tar.gz
Disable two_step_rebase feature flag
Disabling because of https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
-rw-r--r--app/models/repository.rb2
-rw-r--r--changelogs/unreleased/dm-disable-two-step-rebase.yml5
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