summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-05 08:47:54 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2018-10-05 08:47:54 +0000
commit0c32a0429dcf5c647b9947cbec2354e5ad5bc95f (patch)
tree134af732565a24e98b8ff31293beabf21f38707a
parent89ccade810447656d457cff441eff2318b2c7998 (diff)
downloadgitlab-ce-0c32a0429dcf5c647b9947cbec2354e5ad5bc95f.tar.gz
Update CHANGELOG.md for 11.3.4
[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-3.yml5
4 files changed, 9 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29c3251015..b345a3f3d1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.3.4 (2018-10-05)
+
+### Security (3 changes)
+
+- Filter user sensitive data from discussions JSON. !2537
+- Properly filter private references from system notes.
+- Markdown API no longer displays confidential title references unless authorized.
+
+
## 11.3.3 (2018-10-04)
- No 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-3.yml b/changelogs/unreleased/security-osw-user-info-leak-discussions-11-3.yml
deleted file mode 100644
index 0276ffe032f..00000000000
--- a/changelogs/unreleased/security-osw-user-info-leak-discussions-11-3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Filter user sensitive data from discussions JSON
-merge_request: 2537
-author:
-type: security