summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-10 19:40:18 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-10 19:40:18 +0100
commitb20f677baa94aaea1dbc3437c51abbfd6f0e1548 (patch)
tree2baa6a04f1e10deb920b63ea1a28b8f1cc8457a6 /CHANGELOG
parent746320cea769f8de33ba2b7f7d6980a911319edf (diff)
parente3ee46a13b91a6cefb0efb1841fb24afed37b674 (diff)
downloadgitlab-ce-b20f677baa94aaea1dbc3437c51abbfd6f0e1548.tar.gz
Merge remote-tracking branch 'origin/emoji_edit_disallow'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 18a9d317cc4..750ee1016d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.3.0 (unreleased)
- Use new style for wiki
- Use new style for milestone detail page
- Fix sidebar tooltips when collapsed
+ - Prevent possible XSS attack with award-emoji
v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu)