summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-25 10:38:40 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-04-25 10:38:40 +0000
commit2243634b5d586c84e85853a7668ea69100c98010 (patch)
tree31c1d493245179e9e243138b5bc894cfc0b4a3c6
parentef034f674d34b5c9aae951f96f05db1ccf10143e (diff)
parentbbdd39d2427b10f23a16c7f5ce64f9e4cd2b3f92 (diff)
downloadgitlab-ce-2243634b5d586c84e85853a7668ea69100c98010.tar.gz
Merge branch 'security-update-gitaly-to-11-27-2' into '11-9-stable'
Improve credentials sanitization on repository mirror integration See merge request gitlab/gitlabhq!3077
-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 08002f86cc8..457f0385465 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.27.1
+1.27.2
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..288153487ab
--- /dev/null
+++ b/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
@@ -0,0 +1,5 @@
+---
+title: Loosen regex for exception sanitization
+merge_request: 3077
+author:
+type: security