diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-06-03 10:04:57 -0700 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-03 10:04:57 -0700 |
| commit | a2c767b9f8e22398daa19e62597f2663aadf457d (patch) | |
| tree | d390cf8db76cfd2f069b8957a255a064b99590ec /changelogs | |
| parent | 96ff9c6bd82a6eb60b9f2d1c20fca0105ed4160d (diff) | |
| parent | 5906fb2e45f352b8fc02f0e98a6148d0c0b2db59 (diff) | |
| download | gitlab-ce-a2c767b9f8e22398daa19e62597f2663aadf457d.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml b/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml new file mode 100644 index 00000000000..d9ad5af256a --- /dev/null +++ b/changelogs/unreleased/security-58856-persistent-xss-in-note-objects.yml @@ -0,0 +1,5 @@ +--- +title: Prevent XSS injection in note imports +merge_request: +author: +type: security diff --git a/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml b/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml new file mode 100644 index 00000000000..5b79258af54 --- /dev/null +++ b/changelogs/unreleased/security-60143-address-xss-issue-in-wiki-links.yml @@ -0,0 +1,5 @@ +--- +title: Filter relative links in wiki for XSS +merge_request: +author: +type: security |