summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 13:24:05 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-26 13:24:05 +0000
commitc9b5d09a9fa3647f0aaf5eb93747bd8f6476504b (patch)
tree8e5d08ded054a26537b290878e76da123b7f2702
parentc8df2a9b74e7729fb3b17e5d472faf8348b9fc93 (diff)
parent599f5aa2390ac657c2d445c88a6ad2f39f4d10b3 (diff)
downloadgitlab-ce-c9b5d09a9fa3647f0aaf5eb93747bd8f6476504b.tar.gz
Merge branch 'security-12-2-stable-gitaly-1.59.2' into '12-2-stable'
Gitaly: ignore git redirects See merge request gitlab/gitlabhq!3374
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/security-12-2-stable-gitaly-1-59-2.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index bb120e876c6..7b39b399ade 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.59.0
+1.59.2
diff --git a/changelogs/unreleased/security-12-2-stable-gitaly-1-59-2.yml b/changelogs/unreleased/security-12-2-stable-gitaly-1-59-2.yml
new file mode 100644
index 00000000000..cbcd5f545a0
--- /dev/null
+++ b/changelogs/unreleased/security-12-2-stable-gitaly-1-59-2.yml
@@ -0,0 +1,5 @@
+---
+title: "Gitaly: ignore git redirects"
+merge_request:
+author:
+type: security