diff options
| author | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 14:12:23 +0000 |
|---|---|---|
| committer | John Skarbek <jskarbek@gitlab.com> | 2019-08-09 14:12:23 +0000 |
| commit | 06210fc6cfd41f257bb93688e7e9c226f52dd165 (patch) | |
| tree | 7fd8b4bf46f793d2d7fc9656d92147ce859296c3 | |
| parent | 34d086f3e14eecf3bfdcf766f7b3499bd3aad47b (diff) | |
| parent | a1662356240536b7df4a40b41253517968869b83 (diff) | |
| download | gitlab-ce-06210fc6cfd41f257bb93688e7e9c226f52dd165.tar.gz | |
Merge branch 'security-12-1-fix-gitlab-api-token-recovery' into '12-1-stable'
Fix gitlab api token recovery
See merge request gitlab/gitlabhq!3293
| -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 bd8bf882d06..943f9cbc4ec 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.7.0 +1.7.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..b8193368360 --- /dev/null +++ b/changelogs/unreleased/security-pages-api-token-recovery.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie +merge_request: +author: +type: security |