Merge branch 'winh-merge-dev-docs' into 'master'

Resolve merge conflicts with dev.gitlab.org/master after security release See merge request gitlab-org/gitlab-ce!15851 (cherry picked from commit d9f40fdd) 4f992572 Update CHANGELOG.md for 10.2.4 84b3c215 Update CHANGELOG.md for 10.1.5 fad2a07c Update CHANGELOG.md for 10.0.7 10131bf2 Merge remote-tracking branch 'gitlab-ce/master' d9453a24 Merge dev.gitlab.org/master into winh-merge-dev be586388 Make CHANGELOG.md consistent for 10.2.4, 10.1.5, and 10.0.7

Merge branch 'winh-merge-dev-docs' into 'master'
f229fff4 · Winnie Hellmann · LUKE BENNETT · 8c760613 · f229fff4
Commit f229fff4 authored Dec 11, 2017 by Winnie Hellmann Committed by LUKE BENNETT Dec 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 2 deletions

CHANGELOG.md CHANGELOG.md +24 -2

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

-## 10.2.4 (2017-12-08)
+## 10.2.4 (2017-12-07)

-### Security (4 changes)
+### Security (5 changes)

 - Fix e-mail address disclosure through member search fields
 - Prevent creating issues through API when user does not have permissions
@@ -248,6 +248,17 @@ entry.
 - Add Gitaly metrics to the performance bar.


+## 10.1.5 (2017-12-07)
+
+### Security (5 changes)
+
+- Fix e-mail address disclosure through member search fields
+- Prevent creating issues through API when user does not have permissions
+- Prevent an information disclosure in the Groups API
+- Fix user without access to private Wiki being able to see it on the project page
+- Fix Cross-Site Scripting (XSS) vulnerability while editing a comment
+
+
 ## 10.1.4 (2017-11-14)

 ### Fixed (4 changes)
@@ -496,6 +507,17 @@ entry.
 - creation of keys moved to services. !13331 (haseebeqx)
 - Add username as GL_USERNAME in hooks.

+## 10.0.7 (2017-12-07)
+
+### Security (5 changes)
+
+- Fix e-mail address disclosure through member search fields
+- Prevent creating issues through API when user does not have permissions
+- Prevent an information disclosure in the Groups API
+- Fix user without access to private Wiki being able to see it on the project page
+- Fix Cross-Site Scripting (XSS) vulnerability while editing a comment
+
+
 ## 10.0.5 (2017-11-03)

 - [FIXED] Fix incorrect X-axis labels in Prometheus graphs. !14258