diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-08-27 13:32:20 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-08-27 13:32:20 +0000 |
| commit | a6654fc35f79a70f6570018e664868f2c31baa16 (patch) | |
| tree | 8da11b091235dfc3d46a8442b892934001381167 | |
| parent | 7bf971eb9636db98741686088d1011081760ebcb (diff) | |
| download | gitlab-ce-a6654fc35f79a70f6570018e664868f2c31baa16.tar.gz | |
Update CHANGELOG.md for 11.1.5
[ci skip]
5 files changed, 13 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e0fb8cffbf..57d20220723 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 11.1.5 (2018-08-27) + +### Security (3 changes) + +- Fixed persistent XSS rendering/escaping of diff location lines. +- Adding CSRF protection to Hooks resend action. +- Block link-local addresses in URLBlocker. + +### Fixed (1 change, 1 of them is from the community) + +- Sanitize git URL in import errors. (Jamie Schembri) + + ## 11.1.4 (2018-07-30) - No changes. diff --git a/changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml b/changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml deleted file mode 100644 index c757e55f1cd..00000000000 --- a/changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sanitize git URL in import errors -merge_request: -author: Jamie Schembri -type: fixed diff --git a/changelogs/unreleased/security-49085-11-1-persistent-xss-rendering.yml b/changelogs/unreleased/security-49085-11-1-persistent-xss-rendering.yml deleted file mode 100644 index dc15d356c1c..00000000000 --- a/changelogs/unreleased/security-49085-11-1-persistent-xss-rendering.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed persistent XSS rendering/escaping of diff location lines -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml b/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml deleted file mode 100644 index 018acb9c5af..00000000000 --- a/changelogs/unreleased/security-fj-missing-csrf-system-hooks-resend.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adding CSRF protection to Hooks resend action -merge_request: -author: -type: security diff --git a/changelogs/unreleased/sh-block-link-local-master.yml b/changelogs/unreleased/sh-block-link-local-master.yml deleted file mode 100644 index 0a6017479af..00000000000 --- a/changelogs/unreleased/sh-block-link-local-master.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Block link-local addresses in URLBlocker -merge_request: -author: -type: security |