Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-10-16 20:00:30 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-10-16 20:00:30 +0300
commit422792ccb1debc09152903e28bc594f7ae66e8fd (patch)
tree1c4db307996bbe2a294580858a6c2b70c447c1f6
parentf7bc73109c8ee5f1a3b0c04119bee23d120ec66a (diff)
Update CHANGELOG.md for 10.0.4
[ci skip]
-rw-r--r--CHANGELOG.md6
-rw-r--r--changelogs/unreleased/38126-security-username-change.yml5
-rw-r--r--changelogs/unreleased/fix-arbitrary-redirect-vulnerability.yml5
-rw-r--r--changelogs/unreleased/rs-sanitize-unicode-in-protocol.yml5
4 files changed, 6 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a555ba4ef5e..8d0adcc3811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.0.4 (2017-10-16)
+
+- [SECURITY] Move project repositories between namespaces when renaming users.
+- [SECURITY] Prevent an open redirect on project pages.
+- [SECURITY] Prevent a persistent XSS in user-provided markup.
+
## 10.0.3 (2017-10-05)
- [FIXED] find_user Users helper method no longer overrides find_user API helper method. !14418
diff --git a/changelogs/unreleased/38126-security-username-change.yml b/changelogs/unreleased/38126-security-username-change.yml
deleted file mode 100644
index 6b0dfc3dca2..00000000000
--- a/changelogs/unreleased/38126-security-username-change.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move project repositories between namespaces when renaming users
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/fix-arbitrary-redirect-vulnerability.yml b/changelogs/unreleased/fix-arbitrary-redirect-vulnerability.yml
deleted file mode 100644
index 8d456b57963..00000000000
--- a/changelogs/unreleased/fix-arbitrary-redirect-vulnerability.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent an open redirect on project pages
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/rs-sanitize-unicode-in-protocol.yml b/changelogs/unreleased/rs-sanitize-unicode-in-protocol.yml
deleted file mode 100644
index 093c99943e2..00000000000
--- a/changelogs/unreleased/rs-sanitize-unicode-in-protocol.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent a persistent XSS in user-provided markup
-merge_request:
-author:
-type: security