diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-12-02 11:48:32 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-09 03:38:35 +0300 |
| commit | edf7dbfacd5a6b884ae1af72204e3718e89f3c35 (patch) | |
| tree | d1c4884a635a0fe7cef2cef1b3b04cc375ab8570 /changelogs | |
| parent | 6e1b52b8b9b83cb774a5f2f52d4b4355590f14f7 (diff) | |
Merge branch 'html-safe-diff-line-content' into 'security'
Don't accidentally mark unsafe diff lines as HTML safe
Fixes potential XSS issue when a legacy diff note is created on a merge
request whose diff contained HTML
See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249
See merge request !2040
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/html-safe-diff-line-content.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/html-safe-diff-line-content.yml b/changelogs/unreleased/html-safe-diff-line-content.yml new file mode 100644 index 00000000000..8f8bbc51963 --- /dev/null +++ b/changelogs/unreleased/html-safe-diff-line-content.yml @@ -0,0 +1,4 @@ +--- +title: Don't accidentally mark unsafe diff lines as HTML safe +merge_request: +author: |