summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-09-11 00:18:35 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-09-11 00:18:35 +0000
commit0dbd7139caefb94eac3cc51beac53453663b04c2 (patch)
tree6d1d6178b7f25cb790918a0312ba1d1e9125501a
parent99e208281768e5414e3be694023c3e776efb1e24 (diff)
parent44a0ba3306f3d5cfc50eeaaf496c5f4fbb7e6baf (diff)
downloadgitlab-ce-0dbd7139caefb94eac3cc51beac53453663b04c2.tar.gz
Merge remote-tracking branch 'dev/12-1-stable' into 12-1-stable
-rw-r--r--CHANGELOG.md7
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--VERSION2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c78f845ce9..fd0266a2a69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 12.1.9
+
+### Security (1 change)
+
+- Upgrade pages to 1.7.2.
+
+
## 12.1.8
### Security (21 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
diff --git a/VERSION b/VERSION
index 0963c6041ea..fe4d0126a38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.8
+12.1.9