summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-03-13 15:41:01 +0000
committerRobert Speicher <robert@gitlab.com>2017-03-13 15:41:01 +0000
commita6f9913f71a61399fd2b7b6af94551ea6aeeb71f (patch)
tree446cd4155de4af2d26b2dd825f30c3488a507a8b
parent34419c96284d5add977486202f958d2df108d77d (diff)
parent25301ea7512d5a1accd230783b361811281a80d4 (diff)
downloadgitlab-ce-a6f9913f71a61399fd2b7b6af94551ea6aeeb71f.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: