Merge branch 'security-pages-api-token-recovery' into 'master'

Fix gitlab api token recovery See merge request gitlab/gitlabhq!3286

Merge branch 'security-pages-api-token-recovery' into 'master'
Fix gitlab api token recovery See merge request gitlab/gitlabhq!3286
ffa954c9 · John Skarbek · 71d88154 · 2fe060a2 · ffa954c9 · ffa954c9
Commit ffa954c9 authored Aug 09, 2019 by John Skarbek
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

GITLAB_PAGES_VERSION GITLAB_PAGES_VERSION +1 -1

changelogs/unreleased/security-pages-api-token-recovery.yml changelogs/unreleased/security-pages-api-token-recovery.yml +5 -0

No files found.
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-1.7.0
+1.7.1
--- a/changelogs/unreleased/security-pages-api-token-recovery.yml
+++ b/changelogs/unreleased/security-pages-api-token-recovery.yml
+---
+title: Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie
+merge_request:
+author:
+type: security