diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-09-11 00:18:00 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-09-11 00:18:00 +0000 |
| commit | 39381519f294742e4083dfd6a50c0c8ceddecd5d (patch) | |
| tree | c9d9589f62023b1eefbfdc7f4c147a1fa1e29bd8 | |
| parent | fcd107681ab480f87d5328367d25734ef5b81046 (diff) | |
| parent | 09f8edbc29a2e489e7dfefacdcb589affc5fae0f (diff) | |
| download | gitlab-ce-39381519f294742e4083dfd6a50c0c8ceddecd5d.tar.gz | |
Merge remote-tracking branch 'dev/12-2-stable' into 12-2-stable
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
| -rw-r--r-- | VERSION | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bf05e96d1ab..4d788a6f44a 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 943f9cbc4ec..f8a696c8dc5 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.7.1 +1.7.2 @@ -1 +1 @@ -12.2.4 +12.2.5 |