summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-04-24 14:58:06 -0500
committerMayra Cabrera <mcabrera@gitlab.com>2018-04-24 14:58:06 -0500
commit0653f5c785cfee9ddbe62858da78ba014a2b1a99 (patch)
tree59bb99f38d2c1bd3dda942371f46b1cf3ffceb17
parentbf86fba0ab7a2587b6004a39d8ac584a3f456376 (diff)
downloadgitlab-ce-0653f5c785cfee9ddbe62858da78ba014a2b1a99.tar.gz
Update CHANGELOG.md for 10.6.5
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/security_issue_42029.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da7ffa8ad7f..fcc4225afd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.6.5 (2018-04-24)
+
+### Security (1 change)
+
+- Sanitizes user name to avoid XSS attacks.
+
+
## 10.6.4 (2018-04-09)
### Fixed (8 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/security_issue_42029.yml b/changelogs/unreleased/security_issue_42029.yml
deleted file mode 100644
index 0772e33f930..00000000000
--- a/changelogs/unreleased/security_issue_42029.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sanitizes user name to avoid XSS attacks
-merge_request:
-author:
-type: security