summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-03-13 15:41:01 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-16 18:34:31 +0800
commit09924098d836909811ce96bb219823676d0a92f8 (patch)
tree586e12be663b6c6d1b218e72da7fc4d22d289962
parent271ba0c5d240fa6c1a2bd0e184766d60f3bda6fd (diff)
downloadgitlab-ce-09924098d836909811ce96bb219823676d0a92f8.tar.gz
Merge branch 'pages-0.4.0' into 'master'
Use GitLab Pages v0.4.0 See merge request !9896
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/pages-0-4-0.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index d15723fbe8d..1d0ba9ea182 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-0.3.2
+0.4.0
diff --git a/changelogs/unreleased/pages-0-4-0.yml b/changelogs/unreleased/pages-0-4-0.yml
new file mode 100644
index 00000000000..7286b25125e
--- /dev/null
+++ b/changelogs/unreleased/pages-0-4-0.yml
@@ -0,0 +1,4 @@
+---
+title: Use GitLab Pages v0.4.0
+merge_request: 9896
+author: