summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2019-01-14 16:52:08 +0200
committerAndrew Newdigate <andrew@gitlab.com>2019-01-14 17:06:35 +0200
commit2542e49b7b5771812d54e056e17c45e21da56b48 (patch)
tree3e9c8bc9c708bcf15fcb8e68dafee3891a79e852
parent61c9b7f5e9115e6022d7ce37673cd3d22341a42a (diff)
downloadgitlab-ce-2542e49b7b5771812d54e056e17c45e21da56b48.tar.gz
Upgrades Gitaly to 1.12.1 to fix http_proxy, socket regression
See https://gitlab.com/gitlab-org/gitaly/issues/1447 for details.
-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