Update CHANGELOG.md for 11.2.2

[ci skip]

Update CHANGELOG.md for 11.2.2
[ci skip]
1dea6792 · GitLab Release Tools Bot · Jose Vargas · cdc2bc43 · 1dea6792 · cdc2bc43
Commit 1dea6792 authored 6 years ago by GitLab Release Tools Bot Committed by Jose Vargas 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

CHANGELOG.md CHANGELOG.md +9 -0

changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml ...released/security-fj-missing-csrf-system-hooks-resend.yml +0 -5

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

+## 11.2.2 (2018-08-27)
+
+### Security (3 changes)
+
+- Fixed persistent XSS rendering/escaping of diff location lines.
+- Adding CSRF protection to Hooks resend action.
+- Block link-local addresses in URLBlocker.
+
+
 ## 11.2.1 (2018-08-22)

 ### Fixed (2 changes)

--- a/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml
+++ b/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml
---
-title: Adding CSRF protection to Hooks resend action
-merge_request:
-author:
-type: security