Merge branch 'security-11-11-fix-gitlab-api-token-recovery' into '11-11-stable'

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

Merge branch 'security-11-11-fix-gitlab-api-token-recovery' into '11-11-stable'
Fix gitlab api token recovery See merge request gitlab/gitlabhq!3294
53d06bfb · John Skarbek · 5a342e27 · 1356a5fc · 53d06bfb · 53d06bfb
Commit 53d06bfb 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.5.0
+1.5.1
--- a/changelogs/unreleased/security-pages-api-token-recovery.yml
+++ b/changelogs/unreleased/security-pages-api-token-recovery.yml
+---
+title: Upgrade pages to 1.5.1 to prevent gitlab api token recovery from cookie
+merge_request:
+author:
+type: security