summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2017-12-07 12:52:28 +0100
committerWinnie Hellmann <winnie@gitlab.com>2017-12-07 12:52:28 +0100
commit983b62472c6f9b1805fca28b1f0c716c2cdff5b6 (patch)
tree5389e623c30716df60aeb50fb393c2e5177bb582
parent5773e4feedc062ed1f4b534f84b8c210a7a0e491 (diff)
downloadgitlab-ce-983b62472c6f9b1805fca28b1f0c716c2cdff5b6.tar.gz
Update CHANGELOG.md for 10.2.4
[ci skip]
-rw-r--r--CHANGELOG.md9
-rw-r--r--changelogs/unreleased/bvl-email-disclosure.yml5
-rw-r--r--changelogs/unreleased/issue_30663.yml5
-rw-r--r--changelogs/unreleased/rs-security-group-api.yml5
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 309a86dd773..51e6db845f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.2.4 (2017-12-07)
+
+### Security (3 changes)
+
+- Don't match partial email adresses. !2227
+- Prevent creating issues through API when user does not have permissions.
+- Prevent an information disclosure in the Groups API.
+
+
## 10.2.3 (2017-11-30)
### Fixed (7 changes)
diff --git a/changelogs/unreleased/bvl-email-disclosure.yml b/changelogs/unreleased/bvl-email-disclosure.yml
deleted file mode 100644
index d6cd8709d9f..00000000000
--- a/changelogs/unreleased/bvl-email-disclosure.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't match partial email adresses
-merge_request: 2227
-author:
-type: security
diff --git a/changelogs/unreleased/issue_30663.yml b/changelogs/unreleased/issue_30663.yml
deleted file mode 100644
index b20ed6a82e7..00000000000
--- a/changelogs/unreleased/issue_30663.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent creating issues through API when user does not have permissions
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/rs-security-group-api.yml b/changelogs/unreleased/rs-security-group-api.yml
deleted file mode 100644
index 34a39ddd6dc..00000000000
--- a/changelogs/unreleased/rs-security-group-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent an information disclosure in the Groups API
-merge_request:
-author:
-type: security