summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-08-28 15:53:29 +0000
committerNick Thomas <nick@gitlab.com>2019-08-28 15:53:29 +0000
commit1c4ca89a9950f53c6167d15ffa10e6a909c9c9d4 (patch)
tree1dc50e2981a2ee1ebb26bb73080adaf56240e9c9
parent3312c1d50b2a205c956c3b02a0e5a0c062a27ac3 (diff)
parent5725b56c9e4be64fc539f3ec69f3b4b283bb50a2 (diff)
downloadgitlab-ce-1c4ca89a9950f53c6167d15ffa10e6a909c9c9d4.tar.gz
Merge branch 'bump-pages-1-8' into 'master'
Upgrade pages to 1.8.0 See merge request gitlab-org/gitlab-ce!32334
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/bump-pages-1-8.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 943f9cbc4ec..27f9cd322bb 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.7.1
+1.8.0
diff --git a/changelogs/unreleased/bump-pages-1-8.yml b/changelogs/unreleased/bump-pages-1-8.yml
new file mode 100644
index 00000000000..0201ff0fd5f
--- /dev/null
+++ b/changelogs/unreleased/bump-pages-1-8.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade pages to 1.8.0
+merge_request: 32334
+author:
+type: other