summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:51:58 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:51:58 +0000
commit0811b37de1e90603874ae731b67254cdea6b6b9e (patch)
treea51cebfcb5ac1a98be0874d670781a0b3930bec5
parent36325e121f451d394b42fbe5cbe0b362c0f5c1f8 (diff)
parentb1cd838b3e1957dac820c4c3624826d01bfa21e8 (diff)
downloadgitlab-ce-0811b37de1e90603874ae731b67254cdea6b6b9e.tar.gz
Merge branch 'security-12-0-bump-pages' into '12-0-stable'
Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3381
-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 fdd3be6df54..266146b87cb 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.6.2
+1.6.3
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..30b5f4734f9
--- /dev/null
+++ b/changelogs/unreleased/security-12-3-bump-pages.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade pages to 1.6.3
+merge_request:
+author:
+type: security