summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-11 12:11:22 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-11 12:11:22 +0000
commit42c83723e019a3f34f321f9495e9b559a7c21cd4 (patch)
tree6dac088bfbb7fbe08f2e2d3ce4b69a3524191f91
parent4cc977a945a4ab30e48bedc882aa6966642d99a5 (diff)
downloadgitlab-ce-42c83723e019a3f34f321f9495e9b559a7c21cd4.tar.gz
Update CHANGELOG.md for 13.2.4
[ci skip]
-rw-r--r--CHANGELOG.md11
-rw-r--r--changelogs/unreleased/sarnold-fix-prometheus-issue-creation.yml5
-rw-r--r--changelogs/unreleased/security-fix-import-decompr-issue.yml5
3 files changed, 11 insertions, 10 deletions
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