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.
 
+## 12.1.5
+
+- No changes.
+
 ## 12.1.4
 
 ### Fixed (3 changes)
@@ -48,6 +52,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Don't send CI usage email notifications for self-hosted instances. !14809
 
 
+## 12.0.6
+
+- No changes.
+
 ## 12.0.2 (2019-06-25)
 
 ### Fixed (1 change)
@@ -191,6 +199,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Remove commit count from storage quotass.
 
 
+## 11.11.8
+
+- No changes.
+
 ## 11.11.7
 
 ### Security (5 changes)

CHANGELOG.md

@@ -2,6 +2,14 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.1.5
+
+### Security (2 changes)
+
+- Upgrade Gitaly to 1.53.2 to prevent revision flag injection exploits.
+- Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie.
+
+
 ## 12.1.4
 
 ### Fixed (3 changes, 1 of them is from the community)
@@ -330,6 +338,10 @@ entry.
 - Removes EE differences for app/views/admin/users/show.html.haml.
 
 
+## 12.0.6
+
+- No changes.
+
 ## 12.0.3 (2019-06-27)
 
 - No changes.
@@ -677,6 +689,14 @@ entry.
 - Moves the table pagination shared component.
 
 
+## 11.11.8
+
+### Security (2 changes)
+
+- Upgrade Gitaly to 1.42.7 to prevent revision flag injection exploits.
+- Upgrade pages to 1.5.1 to prevent gitlab api token recovery from cookie.
+
+
 ## 11.11.7
 
 ### Security (9 changes)

GITLAB_PAGES_VERSION

-1.7.0
+1.7.1