From 872b624af1029e3de475373042146af70cb05a5b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 3 Jun 2019 17:18:29 +0000
Subject: [PATCH] Bump Gitaly version to 1.44.0

This change makes sure Gitaly includes a fix to make rebase work again
properly.

Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
---
 GITALY_SERVER_VERSION                                 | 2 +-
 app/models/repository.rb                              | 2 +-
 changelogs/unreleased/dm-disable-two-step-rebase.yml  | 5 -----
 changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml | 5 +++++
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 changelogs/unreleased/dm-disable-two-step-rebase.yml
 create mode 100644 changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index b978278f05f..372cf402c73 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.43.0
+1.44.0
diff --git a/app/models/repository.rb b/app/models/repository.rb
index d43f991bb3e..e05d3dd58ac 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: false)
+    if Feature.disabled?(:two_step_rebase, default_enabled: true)
       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
deleted file mode 100644
index 342d61a20d6..00000000000
--- a/changelogs/unreleased/dm-disable-two-step-rebase.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable two-step rebase which could cause rebases to hang
-merge_request: 28778
-author:
-type: other
diff --git a/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml b/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml
new file mode 100644
index 00000000000..24fadbe3814
--- /dev/null
+++ b/changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml
@@ -0,0 +1,5 @@
+---
+title: Stop two-step rebase from hanging when errors occur
+merge_request: 29068
+author:
+type: fixed