summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-03-27 16:34:16 +0100
committerRobert Speicher <rspeicher@gmail.com>2019-03-27 16:34:16 +0100
commit0428ddec4eee85b2b0ee6fa30295e6680bd7feb6 (patch)
treeb57ba4519b6b9c06c7f971de8aa1276e9249653f
parent640b21cd8a12604ee99b2ab811df8d3e6d558562 (diff)
downloadgitlab-ce-0428ddec4eee85b2b0ee6fa30295e6680bd7feb6.tar.gz
Revert "Update CHANGELOG.md for 11.9.2"
This reverts commit faab4d4b997d892c917e288d5a91f5444d51a49a.
-rw-r--r--CHANGELOG.md14
-rw-r--r--changelogs/unreleased/disallow-guests-to-access-releases.yml5
-rw-r--r--changelogs/unreleased/security-55503-fix-pdf-js-vulnerability.yml5
-rw-r--r--changelogs/unreleased/security-56224.yml5
-rw-r--r--changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml5
-rw-r--r--changelogs/unreleased/security-exif-migration.yml5
-rw-r--r--changelogs/unreleased/security-id-potential-denial-languages.yml5
-rw-r--r--changelogs/unreleased/security-mass-assignment-on-project-update.yml5
-rw-r--r--changelogs/unreleased/use-untrusted-regexp.yml5
9 files changed, 40 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a97044779c..ca52a3a7444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,20 +2,6 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
-## 11.9.2 (2019-03-26)
-
-### Security (8 changes)
-
-- Disallow guest users from accessing Releases.
-- Fix PDF.js vulnerability.
-- Hide "related branches" when user does not have permission.
-- Fix XSS in resolve conflicts form.
-- Added rake task for removing EXIF data from existing uploads.
-- Return cached languages if they've been detected before.
-- Disallow updating namespace when updating a project.
-- Use UntrustedRegexp for matching refs policy.
-
-
## 11.9.1 (2019-03-25)
### Fixed (7 changes)
diff --git a/changelogs/unreleased/disallow-guests-to-access-releases.yml b/changelogs/unreleased/disallow-guests-to-access-releases.yml
new file mode 100644
index 00000000000..f2d518108d2
--- /dev/null
+++ b/changelogs/unreleased/disallow-guests-to-access-releases.yml
@@ -0,0 +1,5 @@
+---
+title: Disallow guest users from accessing Releases
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-55503-fix-pdf-js-vulnerability.yml b/changelogs/unreleased/security-55503-fix-pdf-js-vulnerability.yml
new file mode 100644
index 00000000000..e5d0cd4fee1
--- /dev/null
+++ b/changelogs/unreleased/security-55503-fix-pdf-js-vulnerability.yml
@@ -0,0 +1,5 @@
+---
+title: Fix PDF.js vulnerability
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-56224.yml b/changelogs/unreleased/security-56224.yml
new file mode 100644
index 00000000000..a4e274e6ca5
--- /dev/null
+++ b/changelogs/unreleased/security-56224.yml
@@ -0,0 +1,5 @@
+---
+title: Hide "related branches" when user does not have permission
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml b/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml
new file mode 100644
index 00000000000..f92d2c0dcb1
--- /dev/null
+++ b/changelogs/unreleased/security-56927-xss-resolve-conflicts-branch-name.yml
@@ -0,0 +1,5 @@
+---
+title: Fix XSS in resolve conflicts form
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-exif-migration.yml b/changelogs/unreleased/security-exif-migration.yml
new file mode 100644
index 00000000000..cc529099df5
--- /dev/null
+++ b/changelogs/unreleased/security-exif-migration.yml
@@ -0,0 +1,5 @@
+---
+title: Added rake task for removing EXIF data from existing uploads.
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-id-potential-denial-languages.yml b/changelogs/unreleased/security-id-potential-denial-languages.yml
new file mode 100644
index 00000000000..2194ecb97dc
--- /dev/null
+++ b/changelogs/unreleased/security-id-potential-denial-languages.yml
@@ -0,0 +1,5 @@
+---
+title: Return cached languages if they've been detected before
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/security-mass-assignment-on-project-update.yml b/changelogs/unreleased/security-mass-assignment-on-project-update.yml
new file mode 100644
index 00000000000..93561cd91b3
--- /dev/null
+++ b/changelogs/unreleased/security-mass-assignment-on-project-update.yml
@@ -0,0 +1,5 @@
+---
+title: Disallow updating namespace when updating a project
+merge_request:
+author:
+type: security
diff --git a/changelogs/unreleased/use-untrusted-regexp.yml b/changelogs/unreleased/use-untrusted-regexp.yml
new file mode 100644
index 00000000000..dd7f1bcaca1
--- /dev/null
+++ b/changelogs/unreleased/use-untrusted-regexp.yml
@@ -0,0 +1,5 @@
+---
+title: Use UntrustedRegexp for matching refs policy
+merge_request:
+author:
+type: security