Merge remote-tracking branch 'dev/master'

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 10.7.2 (2018-04-25)
+
+- No changes.
+
 ## 10.7.1 (2018-04-23)
 
 ### Fixed (4 changes)
@@ -88,6 +92,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Breaks utils function to parse codeclimate and sast into separate functions.
 
 
+## 10.6.5 (2018-04-24)
+
+- No changes.
+
 ## 10.6.4 (2018-04-09)
 
 ### Fixed (4 changes)
@@ -272,6 +280,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Rename "Approve Additionally" to "Add approval".
 
 
+## 10.5.8 (2018-04-24)
+
+- No changes.
+
 ## 10.5.7 (2018-04-03)
 
 - No changes.

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)
@@ -237,6 +245,13 @@ entry.
 - Upgrade Gitaly to upgrade its charlock_holmes.
 
 
+## 10.6.5 (2018-04-24)
+
+### Security (1 change)
+
+- Sanitizes user name to avoid XSS attacks.
+
+
 ## 10.6.4 (2018-04-09)
 
 ### Fixed (8 changes, 1 of them is from the community)
@@ -478,6 +493,13 @@ entry.
 - Use host URL to build JIRA remote link icon.
 
 
+## 10.5.8 (2018-04-24)
+
+### Security (1 change)
+
+- Sanitizes user name to avoid XSS attacks.
+
+
 ## 10.5.7 (2018-04-03)
 
 ### Security (2 changes)