diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 17:33:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-27 17:33:09 +0300 |
commit | 05f9b5a73c8c21cdf25a9d4ce984cc9bf21985c3 (patch) | |
tree | 56da6672965506b295210025da73ec1fb7faf2c6 | |
parent | a7201419a1123f77f563f0cf232639e1e3a129af (diff) |
Add latest changes from gitlab-org/security/gitlab@13-9-stable-eev13.9.7
8 files changed, 13 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ac3dec21c8..892e8648b70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.9.7 (2021-04-27) + +### Security (6 changes) + +- Prevent tokens with only read_api scope from executing mutations. +- Update mermaid to version 8.9.2. +- Do not allow deploy tokens in the dependency proxy authentication service. +- Disable keyset pagination for branches by default. +- Bump Carrierwave gem to v1.3.2. +- Restrict setting system_note_timestamp to owners. + + ## 13.9.6 (2021-04-13) ### Security (2 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index c2273bba244..1a88c9491f4 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.9.6
\ No newline at end of file +13.9.7
\ No newline at end of file diff --git a/changelogs/unreleased/327155-prevent-mutation-execution-with-read-api-tokens.yml b/changelogs/unreleased/327155-prevent-mutation-execution-with-read-api-tokens.yml deleted file mode 100644 index 1758390a5cb..00000000000 --- a/changelogs/unreleased/327155-prevent-mutation-execution-with-read-api-tokens.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent tokens with only read_api scope from executing mutations -merge_request: -author: -type: security diff --git a/changelogs/unreleased/mermaid-8-9-2.yml b/changelogs/unreleased/mermaid-8-9-2.yml deleted file mode 100644 index 7cb4731fa33..00000000000 --- a/changelogs/unreleased/mermaid-8-9-2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update mermaid to version 8.9.2 -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-10io-dependency-proxy-and-deploy-tokens.yml b/changelogs/unreleased/security-10io-dependency-proxy-and-deploy-tokens.yml deleted file mode 100644 index 26137a42420..00000000000 --- a/changelogs/unreleased/security-10io-dependency-proxy-and-deploy-tokens.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Do not allow deploy tokens in the dependency proxy authentication service -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-322500-disable-gitaly-branch-pagination-ff-by-default.yml b/changelogs/unreleased/security-322500-disable-gitaly-branch-pagination-ff-by-default.yml deleted file mode 100644 index 869cd7ab57c..00000000000 --- a/changelogs/unreleased/security-322500-disable-gitaly-branch-pagination-ff-by-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Disable keyset pagination for branches by default -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-bump-carrierwave-to-1-3-2.yml b/changelogs/unreleased/security-bump-carrierwave-to-1-3-2.yml deleted file mode 100644 index 4e31f9d855d..00000000000 --- a/changelogs/unreleased/security-bump-carrierwave-to-1-3-2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump Carrierwave gem to v1.3.2 -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-disallow-changing-timestamps-on-issue-create-update.yml b/changelogs/unreleased/security-disallow-changing-timestamps-on-issue-create-update.yml deleted file mode 100644 index 7acd005abaa..00000000000 --- a/changelogs/unreleased/security-disallow-changing-timestamps-on-issue-create-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Restrict setting system_note_timestamp to owners -merge_request: -author: -type: security |