summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-07-12 13:49:09 +0000
committerNick Thomas <nick@gitlab.com>2019-07-12 13:49:09 +0000
commit21c372827eb0b536d667dd2ae16e5a4930db6300 (patch)
tree8d9fc5ee2ce809e4f72abdbb0b02ada24f1f1e33
parente13f07f1954f9f4d1cffed0f4c6d63c8ee7aa2a6 (diff)
parent14db519a5dd576e926de2bbea18302a027e82e9e (diff)
downloadgitlab-ce-21c372827eb0b536d667dd2ae16e5a4930db6300.tar.gz
Merge branch 'update-pages-to-1.7.0' into 'master'
Update GitLab Pages to v1.7.0 See merge request gitlab-org/gitlab-ce!30664
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/update-pages-to-1-7-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 9c6d6293b1a..bd8bf882d06 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.6.1
+1.7.0
diff --git a/changelogs/unreleased/update-pages-to-1-7-0.yml b/changelogs/unreleased/update-pages-to-1-7-0.yml
new file mode 100644
index 00000000000..d41346f021c
--- /dev/null
+++ b/changelogs/unreleased/update-pages-to-1-7-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab Pages to v1.7.0
+merge_request:
+author:
+type: other