Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

b808089d · Robert Speicher · d198363c · e70a0c70 · b808089d · b808089d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
  
+## 12.2.5
+
+### Security (1 change)
+
+- Upgrade pages to 1.7.2.
+
+
 ## 12.2.4
  
 ### Fixed (7 changes)

--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-1.8.0
+1.8.1
--- a/changelogs/unreleased/security-12-3-bump-pages.yml
+++ b/changelogs/unreleased/security-12-3-bump-pages.yml
+---
+title: Upgrade pages to 1.8.1
+merge_request:
+author:
+type: security