summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-26 14:00:24 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-26 14:00:24 +0000
commit47949f6a70760432cf19302d4a8bbb885cdb1368 (patch)
treeacbe0682ceae6d6f49c3bb5404d198b4755825ee
parent1791e3e68d6e7507fce776387aa9a8115e67752a (diff)
parente0befbdcf751788d2226fc752b5d6e8bc7308bb3 (diff)
downloadgitlab-ce-47949f6a70760432cf19302d4a8bbb885cdb1368.tar.gz
Merge branch 'security-gitaly-1-53-4' into '12-1-stable'
Fix Gitaly SearchBlobs flag RPC injection [Gitaly v1.53.4] See merge request gitlab/gitlabhq!3435
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/security-gitaly-1-53-4.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index ede3db7b44f..d2a66dacc36 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.53.3
+1.53.4
diff --git a/changelogs/unreleased/security-gitaly-1-53-4.yml b/changelogs/unreleased/security-gitaly-1-53-4.yml
new file mode 100644
index 00000000000..e532a8aba9f
--- /dev/null
+++ b/changelogs/unreleased/security-gitaly-1-53-4.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Gitaly SearchBlobs flag RPC injection
+merge_request:
+author:
+type: security