diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-09-10 19:55:11 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-09-10 19:55:11 -0500 |
| commit | b808089d9b4c1c844a88c7a5736ddf55faa7cf3a (patch) | |
| tree | 0ff82588b522fc11d21ef6bb34872583efe88896 | |
| parent | d198363cc49d30b99cc3bb0ec544a46cf7ad6d40 (diff) | |
| parent | e70a0c70e2a1e3092a5b561cd85f8a8a1425482b (diff) | |
| download | gitlab-ce-b808089d9b4c1c844a88c7a5736ddf55faa7cf3a.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-12-3-bump-pages.yml | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a432b091c7e..e379c23ee3c 100644 --- 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) diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 27f9cd322bb..a8fdfda1c78 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.8.0 +1.8.1 diff --git a/changelogs/unreleased/security-12-3-bump-pages.yml b/changelogs/unreleased/security-12-3-bump-pages.yml new file mode 100644 index 00000000000..cf602e3cf48 --- /dev/null +++ b/changelogs/unreleased/security-12-3-bump-pages.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade pages to 1.8.1 +merge_request: +author: +type: security |