summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:52:09 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:52:09 +0000
commit69a1af2a3ec564a70f60ba09bb8a538f094dfd71 (patch)
tree031e5f5471953830157107ba9e70bfe7ab57282e
parentfcd107681ab480f87d5328367d25734ef5b81046 (diff)
parent5c8088da57b85f2ddfc587bf888ae357c2d25f10 (diff)
downloadgitlab-ce-69a1af2a3ec564a70f60ba09bb8a538f094dfd71.tar.gz
Merge branch 'security-12-2-bump-pages' into '12-2-stable'
Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3379
-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 943f9cbc4ec..f8a696c8dc5 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.7.1
+1.7.2
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..8f4b93d0a76
--- /dev/null
+++ b/changelogs/unreleased/security-12-3-bump-pages.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade pages to 1.7.2
+merge_request:
+author:
+type: security