diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-07-26 00:27:53 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-07-26 00:27:53 +0000 |
commit | 0040326b43be74d9d5d7396efb70a4f3210580ef (patch) | |
tree | 5011d5aefa5ad186b91a02401dde0c77625fdc21 | |
parent | a9a2c0dfdb21cea5211f3879dcf5fd619b913540 (diff) | |
download | gitlab-ce-0040326b43be74d9d5d7396efb70a4f3210580ef.tar.gz |
Update CHANGELOG.md for 11.1.2
[ci skip]
-rw-r--r-- | CHANGELOG.md | 18 | ||||
-rw-r--r-- | changelogs/unreleased/48617-promoting-milestone.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/event-counters-private-data.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/pr-importer-project-name.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/security-ide-branch-name-xss.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/sh-revert-markdown-changes.yml | 5 |
7 files changed, 18 insertions, 30 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c7780abbaa4..57887b25881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.1.2 (2018-07-26) + +### Security (4 changes) + +- Adding CSRF protection to Hooks test action. +- Don't expose project names in GitHub counters. +- Don't expose project names in various counters. +- Fixed XSS in branch name in Web IDE. + +### Fixed (1 change) + +- Escapes milestone and label's names on flash notice when promoting them. + +### Performance (1 change) + +- Fix slow Markdown rendering. !20820 + + ## 11.1.1 (2018-07-23) ### Fixed (2 changes) diff --git a/changelogs/unreleased/48617-promoting-milestone.yml b/changelogs/unreleased/48617-promoting-milestone.yml deleted file mode 100644 index 7fbc15051cf..00000000000 --- a/changelogs/unreleased/48617-promoting-milestone.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Escapes milestone and label's names on flash notice when promoting them -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/event-counters-private-data.yml b/changelogs/unreleased/event-counters-private-data.yml deleted file mode 100644 index 3dbd8a4ed9c..00000000000 --- a/changelogs/unreleased/event-counters-private-data.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't expose project names in various counters -merge_request: -author: -type: security diff --git a/changelogs/unreleased/pr-importer-project-name.yml b/changelogs/unreleased/pr-importer-project-name.yml deleted file mode 100644 index 3b01b048589..00000000000 --- a/changelogs/unreleased/pr-importer-project-name.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't expose project names in GitHub counters -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml b/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml deleted file mode 100644 index fabf48acbbc..00000000000 --- a/changelogs/unreleased/security-fj-missing-csrf-system-hooks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adding CSRF protection to Hooks test action -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-ide-branch-name-xss.yml b/changelogs/unreleased/security-ide-branch-name-xss.yml deleted file mode 100644 index 51742ffa4e9..00000000000 --- a/changelogs/unreleased/security-ide-branch-name-xss.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed XSS in branch name in Web IDE -merge_request: -author: -type: security diff --git a/changelogs/unreleased/sh-revert-markdown-changes.yml b/changelogs/unreleased/sh-revert-markdown-changes.yml deleted file mode 100644 index 72540f710a1..00000000000 --- a/changelogs/unreleased/sh-revert-markdown-changes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix slow Markdown rendering -merge_request: 20820 -author: -type: performance |