summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-04-03 16:51:23 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-04-03 16:51:23 +0000
commit209865350ed58502ac9069eb9fe475d47f1a1165 (patch)
treed0b7b33fb874fb84e556970a341eedd032de0105
parent047caa8c3a34989ce4dea99831bda1cb89cc36d3 (diff)
parent001a5fc6baf57d1ca3f1a88539dcf0b6b4f339a6 (diff)
downloadgitlab-ce-209865350ed58502ac9069eb9fe475d47f1a1165.tar.gz
Merge branch 'zj-bump-gitaly' into 'master'
Upgrade Gitaly server verion See merge request gitlab-org/gitlab-ce!18147
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/zj-bump-gitaly.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 36545ad338e..9188543ea64 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.92.0
+0.93.0
diff --git a/changelogs/unreleased/zj-bump-gitaly.yml b/changelogs/unreleased/zj-bump-gitaly.yml
new file mode 100644
index 00000000000..eb28bed70e4
--- /dev/null
+++ b/changelogs/unreleased/zj-bump-gitaly.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Gitaly to upgrade its charlock_holmes
+merge_request:
+author:
+type: other