summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-11 00:38:33 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-11 00:38:33 +0000
commite70a0c70e2a1e3092a5b561cd85f8a8a1425482b (patch)
tree70501344b4568220d6fccdb86d1046f805b0af1b
parent54a2f42bf7b5ec44b6c167d65f434c9f5cabb547 (diff)
parentc78c1f80a7b2635608f0947a19032349febeebd4 (diff)
downloadgitlab-ce-e70a0c70e2a1e3092a5b561cd85f8a8a1425482b.tar.gz
Merge branch 'security-12-3-bump-pages' into 'master'
Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3378
-rw-r--r--GITLAB_PAGES_VERSION2
-rw-r--r--changelogs/unreleased/security-12-3-bump-pages.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 27f9cd322bb..a8fdfda1c78 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.8.0
+1.8.1
diff --git a/changelogs/unreleased/security-12-3-bump-pages.yml b/changelogs/unreleased/security-12-3-bump-pages.yml
new file mode 100644
index 00000000000..cf602e3cf48
--- /dev/null
+++ b/changelogs/unreleased/security-12-3-bump-pages.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade pages to 1.8.1
+merge_request:
+author:
+type: security