summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-12 16:47:20 +0000
committerNick Thomas <nick@gitlab.com>2019-06-12 16:47:20 +0000
commit95c16e482847d9847f6513b4d905ab7807238dd6 (patch)
tree37a3d6c455e3c862c0871e5a15647d98a0f66af8
parent8ade1f8758efa687e67c0c29e8d67217c31c9e0f (diff)
parent1354a469088b3d95faa0cbac3ee2bea1d494234c (diff)
downloadgitlab-ce-95c16e482847d9847f6513b4d905ab7807238dd6.tar.gz
Merge branch 'upgrade-pages-to-v1.6.1' into 'master'
Upgrade pages to v1.6.1 Closes gitlab-pages#228 See merge request gitlab-org/gitlab-ce!29559
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/upgrade-pages-to-v1-6-1.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index dc1e644a101..9c6d6293b1a 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.6.0
+1.6.1
diff --git a/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml b/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml
new file mode 100644
index 00000000000..0ab58bb50d8
--- /dev/null
+++ b/changelogs/unreleased/upgrade-pages-to-v1-6-1.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab Pages to v1.6.1
+merge_request: 29559
+author:
+type: other