summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Azzopardi <steveazz@outlook.com>2018-11-23 15:31:01 +0100
committerSteve Azzopardi <steveazz@outlook.com>2018-11-23 15:31:01 +0100
commitac83d64364dd484ed872030ae4c326345da7fd7c (patch)
treeca7995b1bf2bc034054280c5ce6c3fc618d99533
parent56417b96e097901c044b4e4655385de1d2e4e506 (diff)
parent82190ba7d583f1975a2ece8eeeda3a724ea5de47 (diff)
downloadgitlab-ce-ac83d64364dd484ed872030ae4c326345da7fd7c.tar.gz
Merge branch '11-3-stable' into security-11-3
-rw-r--r--CHANGELOG.md7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dae1f5e5d30..00ade269250 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.3.10 (2018-11-18)
+
+### Security (1 change)
+
+- Escape user fullname while rendering autocomplete template to prevent XSS.
+
+
## 11.3.9 (2018-10-31)
### Security (1 change)
diff --git a/VERSION b/VERSION
index dedbfe44415..fa4d9ded4c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.9
+11.3.10