kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Bump Gitaly version to 1.44.0

Browse source 
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
This commit is contained in:
Douwe Maan 2019-06-03 17:18:29 +00:00 committed by Mayra Cabrera
parent a2c767b9f8
commit 872b624af1
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GITALY_SERVER_VERSION
View file

@ -1 +1 @@
1.43.0
1.44.0

2
app/models/repository.rb
View file

@ -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

5
changelogs/unreleased/dm-disable-two-step-rebase.yml
View file

@ -1,5 +0,0 @@
---
title: Disable two-step rebase which could cause rebases to hang
merge_request: 28778
author:
type: other

5
changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Stop two-step rebase from hanging when errors occur
merge_request: 29068
author:
type: fixed