summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:52:04 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-09-10 12:52:04 +0000
commitd6e73bedec4e77c460f490ed7ee1dd26ee0706a9 (patch)
treeff088842fa8e251230146f204a044a2e27d4a845
parent99e208281768e5414e3be694023c3e776efb1e24 (diff)
parent54905ee8fdc3ed7d51051505a5dd8ec85604eccc (diff)
downloadgitlab-ce-d6e73bedec4e77c460f490ed7ee1dd26ee0706a9.tar.gz
Merge branch 'security-12-1-bump-pages' into '12-1-stable'
Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3380
-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