diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-09-11 00:18:35 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-09-11 00:18:35 +0000 |
commit | fff92356df7b8bab1d5dd424fb1d9127ce5908cb (patch) | |
tree | 6a282925c16fccf800f9fda6e283f04648a81f89 | |
parent | 36325e121f451d394b42fbe5cbe0b362c0f5c1f8 (diff) | |
parent | 891da1422d92a9485014606691599264da0934c3 (diff) | |
download | gitlab-ce-fff92356df7b8bab1d5dd424fb1d9127ce5908cb.tar.gz |
Merge remote-tracking branch 'dev/12-0-stable' into 12-0-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 b0ee969dd58..2180f24f7e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.0.9 + +### Security (1 change) + +- Upgrade pages to 1.6.3. + + ## 12.0.8 ### Security (22 changes) diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index fdd3be6df54..266146b87cb 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.6.2 +1.6.3 @@ -1 +1 @@ -12.0.8 +12.0.9 |