From 872b624af1029e3de475373042146af70cb05a5b Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 3 Jun 2019 17:18:29 +0000 Subject: 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 --- changelogs/unreleased/dm-disable-two-step-rebase.yml | 5 ----- changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 changelogs/unreleased/dm-disable-two-step-rebase.yml create mode 100644 changelogs/unreleased/zj-gitlab-ce-zj-bump-gitaly.yml (limited to 'changelogs') 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 -- cgit v1.2.1