diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-03 16:47:13 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-03 16:47:13 +0100 |
| commit | 172641573d1566e144532a85fd87a3462c2498e6 (patch) | |
| tree | 37be7be9a5a73223cc856a9f8714f04ff022f518 | |
| parent | 9e24e7cd8df640943b8e2390c318cea6851b5b51 (diff) | |
| download | gitlab-ce-172641573d1566e144532a85fd87a3462c2498e6.tar.gz | |
Update CHANGELOG.md for 10.6.3
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/42028-xss-diffs.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/jej-mattermost-notification-confidentiality.yml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9483423376f..bc4726baf9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.6.3 (2018-04-03) + +### Security (2 changes) + +- Fix XSS on diff view stored on filenames. +- Adds confidential notes channel for Slack/Mattermost. + + ## 10.6.2 (2018-03-29) ### Fixed (2 changes, 1 of them is from the community) diff --git a/changelogs/unreleased/42028-xss-diffs.yml b/changelogs/unreleased/42028-xss-diffs.yml deleted file mode 100644 index a05f9d3c78d..00000000000 --- a/changelogs/unreleased/42028-xss-diffs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix XSS on diff view stored on filenames -merge_request: -author: -type: security diff --git a/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml b/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml deleted file mode 100644 index d5219b5d019..00000000000 --- a/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds confidential notes channel for Slack/Mattermost -merge_request: -author: -type: security |