diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a50908ca3daf95eba6210f0cc2c11c49f7bc1c9e..975492089e632b5db77467cb9078c96b47ae72a4 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.42.0 +1.42.3 diff --git a/app/models/repository.rb b/app/models/repository.rb index 50bc21274954f3c2c48651547c0ea97d201cd2ea..be17b54ff120c93782db83c5a7dc6f1c9a04026b 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: 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 342d61a20d6f815365450d42db47e0046214c711..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..24fadbe3814f6d699d39f8dbf16a916ce042cfeb --- /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