From 42c83723e019a3f34f321f9495e9b559a7c21cd4 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Tue, 11 Aug 2020 12:11:22 +0000 Subject: Update CHANGELOG.md for 13.2.4 [ci skip] --- CHANGELOG.md | 11 +++++++++++ .../unreleased/sarnold-fix-prometheus-issue-creation.yml | 5 ----- changelogs/unreleased/security-fix-import-decompr-issue.yml | 5 ----- 3 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 changelogs/unreleased/sarnold-fix-prometheus-issue-creation.yml delete mode 100644 changelogs/unreleased/security-fix-import-decompr-issue.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 37984938590..c9b2d98f20e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.2.4 (2020-08-11) + +### Security (1 change) + +- Add decompressed archive size validation on Project/Group Import. !38736 + +### Fixed (1 change) + +- Fix automatic issue creation via Prometheus alerts. !37884 + + ## 13.2.3 (2020-08-05) ### Security (12 changes) diff --git a/changelogs/unreleased/sarnold-fix-prometheus-issue-creation.yml b/changelogs/unreleased/sarnold-fix-prometheus-issue-creation.yml deleted file mode 100644 index 024bd9a7355..00000000000 --- a/changelogs/unreleased/sarnold-fix-prometheus-issue-creation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix automatic issue creation via Prometheus alerts -merge_request: 37884 -author: -type: fixed diff --git a/changelogs/unreleased/security-fix-import-decompr-issue.yml b/changelogs/unreleased/security-fix-import-decompr-issue.yml deleted file mode 100644 index bda41369e65..00000000000 --- a/changelogs/unreleased/security-fix-import-decompr-issue.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add decompressed archive size validation on Project/Group Import -merge_request: 38736 -author: -type: security -- cgit v1.2.3