diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a95a46d9fa9c744512c7b5a10e1ec1f7e77c4e1e..00e952d041c9753725d276381a99684c87d87c59 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 0000000000000000000000000000000000000000..5a61d5db43eb21a31723b31b5cf27e881002fde1 --- /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