summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Azzopardi <steveazz@outlook.com>2018-11-23 15:37:01 +0100
committerSteve Azzopardi <steveazz@outlook.com>2018-11-23 15:37:01 +0100
commit3ff174dbe81d18e34cf1b162820face48d466d95 (patch)
tree6aa1544f388cee2554210737a5d69f534afdbe97
parenteeb11db173d8f9b883b4ee023f0fe4a712e1af1b (diff)
parent98f84238230c94a46a9864a5a267becd67d30b50 (diff)
downloadgitlab-ce-3ff174dbe81d18e34cf1b162820face48d466d95.tar.gz
Merge branch '11-4-stable' into security-11-4
-rw-r--r--CHANGELOG.md11
-rw-r--r--VERSION2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4f5ae8089b..ba343f14232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.4.7 (2018-11-20)
+
+- No changes.
+
+## 11.4.6 (2018-11-18)
+
+### Security (1 change)
+
+- Escape user fullname while rendering autocomplete template to prevent XSS.
+
+
## 11.4.5 (2018-11-04)
### Fixed (4 changes, 1 of them is from the community)
diff --git a/VERSION b/VERSION
index 64d81d98367..30fb042e408 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.5
+11.4.7