From 3fdcb7d8a13551d73dcd808c9e83bd524a593bc3 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 3 May 2019 09:30:20 -0700 Subject: [PATCH] Use 3-way merge for squashing commits This upgrades Gitaly to 1.34.2 for 11-10-stable. --- GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/sh-gitaly-update-for-11-10.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/sh-gitaly-update-for-11-10.yml diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a95a46d9fa9..00e952d041c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.34.1 +1.34.2 diff --git a/changelogs/unreleased/sh-gitaly-update-for-11-10.yml b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml new file mode 100644 index 00000000000..5a61d5db43e --- /dev/null +++ b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml @@ -0,0 +1,5 @@ +--- +title: Use 3-way merge for squashing commits +merge_request: 28078 +author: +type: fixed -- GitLab