diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 22:30:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 22:30:40 +0300 |
| commit | a703ec7cbd9605d05d63a0bdf0eb98101e26362b (patch) | |
| tree | 8f56ce462b3bc83f01445a469277388b2ba27889 | |
| parent | 4bad43a0c899c33a34fde4b3df6e6427e0f700db (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-6-stable-eev13.6.5
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-deny-implicit-confidential.yml | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 61d35535fa5..d995ed28de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.6.5 (2021-01-13) + +### Security (1 change) + +- Deny implicit flow for confidential apps. + + ## 13.6.4 (2021-01-07) ### Security (7 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index d59f23d1885..b22e91bfa5d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.6.4
\ No newline at end of file +13.6.5
\ No newline at end of file diff --git a/changelogs/unreleased/security-deny-implicit-confidential.yml b/changelogs/unreleased/security-deny-implicit-confidential.yml deleted file mode 100644 index bbf2d95b3fb..00000000000 --- a/changelogs/unreleased/security-deny-implicit-confidential.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Deny implicit flow for confidential apps -merge_request: -author: -type: security |