diff options
| author | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 17:12:50 +0300 |
|---|---|---|
| committer | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 17:12:50 +0300 |
| commit | 3499e192bbb8e293811c0fae9171cbcc07810a9d (patch) | |
| tree | ea8fc49052168df70197e3d606926e5dc977a1ef | |
| parent | b80c6d473cecdf4415a24d63afea76e15721cfb4 (diff) | |
| parent | 6986bdb9e1482295c194fb5913e6fc3c9edce6e0 (diff) | |
Merge branch 'security-12-0-pages-api-token-recovery' into '12-0-stable'
Fix gitlab api token recovery
See merge request gitlab/gitlabhq!3292
| -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 9c6d6293b1a..fdd3be6df54 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.6.1 +1.6.2 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..5e281be0cae --- /dev/null +++ b/changelogs/unreleased/security-pages-api-token-recovery.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade pages to 1.6.2 to prevent gitlab api token recovery from cookie +merge_request: +author: +type: security |