summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-06-03 12:35:19 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-06-03 12:35:19 +0000
commit51a66a581f4d0662d04c432aa4b014dd4b634fc9 (patch)
tree66648cc3d5c9c53f8f6fda18061476f33285067b
parent205f0d0cfe7ff47ead965ff120599dc3f2453974 (diff)
parentbbbc9df8b88e7b4d83ec18facbb5df3fdc45d287 (diff)
downloadgitlab-ce-51a66a581f4d0662d04c432aa4b014dd4b634fc9.tar.gz
Merge branch 'update-pages' into 'master'
Update GitLab Pages to v1.6.0 See merge request gitlab-org/gitlab-ce!29048
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/update-pages.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index bc80560fad6..dc1e644a101 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.5.0
+1.6.0
diff --git a/changelogs/unreleased/update-pages.yml b/changelogs/unreleased/update-pages.yml
new file mode 100644
index 00000000000..97a20b6b8fa
--- /dev/null
+++ b/changelogs/unreleased/update-pages.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab Pages to v1.6.0
+merge_request: 29048
+author:
+type: other