diff options
| author | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 17:13:07 +0300 |
|---|---|---|
| committer | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 17:13:07 +0300 |
| commit | 53d06bfbdc888b499a141875a93839184c5317dd (patch) | |
| tree | 4906df9d54eec8323cb7a2ef6bc7e847244f385f | |
| parent | 5a342e2745ce88bef95ccae8255a2b09477f6743 (diff) | |
| parent | 1356a5fcf16fc3674bb09ee4262e628c26e7f476 (diff) | |
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
| -rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-pages-api-token-recovery.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index bc80560fad6..26ca594609a 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.5.0 +1.5.1 diff --git a/changelogs/unreleased/security-pages-api-token-recovery.yml b/changelogs/unreleased/security-pages-api-token-recovery.yml new file mode 100644 index 00000000000..5b555d0774b --- /dev/null +++ b/changelogs/unreleased/security-pages-api-token-recovery.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade pages to 1.5.1 to prevent gitlab api token recovery from cookie +merge_request: +author: +type: security |