summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-25 10:38:54 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-25 10:38:54 +0000
commitec462ae863735295cc26b06a17a548d33f547aae (patch)
tree930f60493972f5bdabe7e6fc1f09f9a92163499d
parent861fe405571e6900ab9aa9f9da867111d93c69f2 (diff)
parent04ecaaf490b9f86cf162c6ac1b4073a67aff2102 (diff)
downloadgitlab-ce-ec462ae863735295cc26b06a17a548d33f547aae.tar.gz
Merge branch 'security-update-gitaly-to-11-33-1' into '11-10-stable'
Improve credentials sanitization on repository mirror integration See merge request gitlab/gitlabhq!3076
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/loosen_regex_for_exception_sanitization.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 2b17ffd5042..a95a46d9fa9 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.34.0
+1.34.1
diff --git a/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml b/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
new file mode 100644
index 00000000000..c90a54d975d
--- /dev/null
+++ b/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
@@ -0,0 +1,5 @@
+---
+title: Loosen regex for exception sanitization
+merge_request: 3076
+author:
+type: security