summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-04-25 09:02:17 -0500
committerMayra Cabrera <mcabrera@gitlab.com>2018-04-25 09:02:17 -0500
commit66449fc3229919ae3379e194d9b9a95c7c1251e7 (patch)
treecc179cf06e77367509798f40bfbb4ec3b69d003a
parentfbf317c25cfaf390592dd87f86f39fd303c0859e (diff)
downloadgitlab-ce-66449fc3229919ae3379e194d9b9a95c7c1251e7.tar.gz
Update CHANGELOG.md for 10.7.2
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/security-45689-fix-archive-cache-bug.yml5
-rw-r--r--changelogs/unreleased/security_issue_42029.yml5
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ffa68f5806..3929320c467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.7.2 (2018-04-25)
+
+### Security (2 changes)
+
+- Serve archive requests with the correct file in all cases.
+- Sanitizes user name to avoid XSS attacks.
+
+
## 10.7.1 (2018-04-23)
### Fixed (11 changes)
diff --git a/changelogs/unreleased/security-45689-fix-archive-cache-bug.yml b/changelogs/unreleased/security-45689-fix-archive-cache-bug.yml
deleted file mode 100644
index 0103a7fc430..00000000000
--- a/changelogs/unreleased/security-45689-fix-archive-cache-bug.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Serve archive requests with the correct file in all cases
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security_issue_42029.yml b/changelogs/unreleased/security_issue_42029.yml
deleted file mode 100644
index 0772e33f930..00000000000
--- a/changelogs/unreleased/security_issue_42029.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sanitizes user name to avoid XSS attacks
-merge_request:
-author:
-type: security