diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-11 22:03:44 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-12-11 22:03:44 +0300 |
| commit | 2404e6c71a9a9b1699bc2dbb487f909a320e21f3 (patch) | |
| tree | dc2631230b479a83077569fe80706f9ebcc299b6 | |
| parent | c6d2d169257ba68cbac86d369285390010359a42 (diff) | |
Update CHANGELOG.md for 12.1.15
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/security-stored-xss-using-find-file.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-xss-grafana-url-12-4.yml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 986cecc3809..624cedd8864 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.1.15 + +### Security (2 changes) + +- Sanitize search text to prevent XSS. +- Fix stored XSS issue for grafana_url. + + ## 12.1.14 - No changes. diff --git a/changelogs/unreleased/security-stored-xss-using-find-file.yml b/changelogs/unreleased/security-stored-xss-using-find-file.yml deleted file mode 100644 index 41cd2f9494f..00000000000 --- a/changelogs/unreleased/security-stored-xss-using-find-file.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sanitize search text to prevent XSS -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-xss-grafana-url-12-4.yml b/changelogs/unreleased/security-xss-grafana-url-12-4.yml deleted file mode 100644 index d0adff94b76..00000000000 --- a/changelogs/unreleased/security-xss-grafana-url-12-4.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix stored XSS issue for grafana_url -merge_request: -author: -type: security |