summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-05 09:37:40 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-05 09:37:40 +0000
commitd8b8a0e1a50076f5876bd676f988be82bef1c164 (patch)
treeae4f5ebc5c940fdd494ce6df32cdd20e16bcdf52
parent8344c4ec326cc3026db23c5484e33766310063c3 (diff)
downloadgitlab-ce-d8b8a0e1a50076f5876bd676f988be82bef1c164.tar.gz
Update CHANGELOG.md for 11.2.5
[ci skip]
-rw-r--r--CHANGELOG.md9
-rw-r--r--changelogs/unreleased/security-bw-confidential-titles-through-markdown-api.yml5
-rw-r--r--changelogs/unreleased/security-fix-leaking-private-project-namespace.yml5
-rw-r--r--changelogs/unreleased/security-osw-user-info-leak-discussions-11-2.yml5
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbda924bbfc..6ad7b74b3b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.2.5 (2018-10-05)
+
+### Security (3 changes)
+
+- Filter user sensitive data from discussions JSON. !2538
+- Properly filter private references from system notes.
+- Markdown API no longer displays confidential title references unless authorized.
+
+
## 11.2.4 (2018-09-26)
### Security (6 changes)
diff --git a/changelogs/unreleased/security-bw-confidential-titles-through-markdown-api.yml b/changelogs/unreleased/security-bw-confidential-titles-through-markdown-api.yml
deleted file mode 100644
index e0231b7962f..00000000000
--- a/changelogs/unreleased/security-bw-confidential-titles-through-markdown-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Markdown API no longer displays confidential title references unless authorized
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-fix-leaking-private-project-namespace.yml b/changelogs/unreleased/security-fix-leaking-private-project-namespace.yml
deleted file mode 100644
index 589d16c0c35..00000000000
--- a/changelogs/unreleased/security-fix-leaking-private-project-namespace.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Properly filter private references from system notes
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-osw-user-info-leak-discussions-11-2.yml b/changelogs/unreleased/security-osw-user-info-leak-discussions-11-2.yml
deleted file mode 100644
index 2720212aca3..00000000000
--- a/changelogs/unreleased/security-osw-user-info-leak-discussions-11-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Filter user sensitive data from discussions JSON
-merge_request: 2538
-author:
-type: security