diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-08-27 15:03:11 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-08-27 15:03:11 +0300 |
| commit | b7715bc01f8213bf29e63b6e990275298492b3f9 (patch) | |
| tree | 4c70c6e2ae2f863724ea906aaf20fc140a58e9bb | |
| parent | 7375faef3c2e7a7d78b5a61adf5c8ccde98d6e2b (diff) | |
Update CHANGELOG.md for 11.2.2
[ci skip]
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 256dd913435..b9a2fca9ce5 100644 --- 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) diff --git a/changelogs/unreleased/security-49085-11-2-persistent-xss-rendering.yml b/changelogs/unreleased/security-49085-11-2-persistent-xss-rendering.yml deleted file mode 100644 index dc15d356c1c..00000000000 --- a/changelogs/unreleased/security-49085-11-2-persistent-xss-rendering.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed persistent XSS rendering/escaping of diff location lines -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml b/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml deleted file mode 100644 index 018acb9c5af..00000000000 --- a/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adding CSRF protection to Hooks resend action -merge_request: -author: -type: security diff --git a/changelogs/unreleased/sh-block-link-local-master.yml b/changelogs/unreleased/sh-block-link-local-master.yml deleted file mode 100644 index 0a6017479af..00000000000 --- a/changelogs/unreleased/sh-block-link-local-master.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Block link-local addresses in URLBlocker -merge_request: -author: -type: security |