summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-03 11:40:14 +0000
committerNick Thomas <nick@gitlab.com>2018-09-03 11:40:14 +0000
commitb2bdb004072a36cb2fb81df0f3d7e68a307bc09c (patch)
tree8618fcfe09f4ee5332479cc8ae315522f213a64b
parent0e05e3a0ff751868edf76c1a220b2154462eec6e (diff)
parentbe74e43c0161474489751120e7d401c2b5db23fa (diff)
downloadgitlab-ce-b2bdb004072a36cb2fb81df0f3d7e68a307bc09c.tar.gz
Merge branch 'sh-bump-gitlab-pages-v1.1.0' into 'master'
Bump GitLab Pages to v1.1.0 See merge request gitlab-org/gitlab-ce!21419
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/sh-bump-gitlab-pages-v1-1-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 3eefcb9dd5b..9084fa2f716 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.0.0
+1.1.0
diff --git a/changelogs/unreleased/sh-bump-gitlab-pages-v1-1-0.yml b/changelogs/unreleased/sh-bump-gitlab-pages-v1-1-0.yml
new file mode 100644
index 00000000000..bc5b6b36ac5
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-gitlab-pages-v1-1-0.yml
@@ -0,0 +1,5 @@
+---
+title: Bump GitLab Pages to v1.1.0
+merge_request: 21419
+author:
+type: fixed