summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-01-16 21:54:59 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-01-16 21:54:59 +0000
commitafbd671b8a45cf3594dd1ac0822db816cb48037d (patch)
tree920495ff596deaadfadd879e7df07017fd1a12a8
parentbcf8ab6364e5298b343601374f337fe90d723a61 (diff)
parent2542e49b7b5771812d54e056e17c45e21da56b48 (diff)
downloadgitlab-ce-afbd671b8a45cf3594dd1ac0822db816cb48037d.tar.gz
Merge branch 'upgrade-gitaly-1.12.1' into '11-7-stable-prepare-rc7'
Upgrade to gitaly 1.12.1 See merge request gitlab-org/gitlab-ce!24361
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-gitaly-1-12-1.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 0eed1a29efd..f8f4f03b3dc 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.12.0
+1.12.1
diff --git a/changelogs/unreleased/upgrade-gitaly-1-12-1.yml b/changelogs/unreleased/upgrade-gitaly-1-12-1.yml
new file mode 100644
index 00000000000..4759a2dd8d8
--- /dev/null
+++ b/changelogs/unreleased/upgrade-gitaly-1-12-1.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade to gitaly 1.12.1
+merge_request: 24361
+author:
+type: fixed