From d8d57a90208c62b29e5218f97525404859232a55 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 27 Apr 2021 14:04:46 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-11-stable-ee --- CHANGELOG.md | 11 +++++++++++ GITALY_SERVER_VERSION | 2 +- ...327155-prevent-mutation-execution-with-read-api-tokens.yml | 5 ----- .../security-10io-dependency-proxy-and-deploy-tokens.yml | 5 ----- ...-322500-disable-gitaly-branch-pagination-ff-by-default.yml | 5 ----- changelogs/unreleased/security-bump-carrierwave-to-1-3-2.yml | 5 ----- ...ty-disallow-changing-timestamps-on-issue-create-update.yml | 5 ----- 7 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 changelogs/unreleased/327155-prevent-mutation-execution-with-read-api-tokens.yml delete mode 100644 changelogs/unreleased/security-10io-dependency-proxy-and-deploy-tokens.yml delete mode 100644 changelogs/unreleased/security-322500-disable-gitaly-branch-pagination-ff-by-default.yml delete mode 100644 changelogs/unreleased/security-bump-carrierwave-to-1-3-2.yml delete mode 100644 changelogs/unreleased/security-disallow-changing-timestamps-on-issue-create-update.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 096a598100e..a48f0afd15b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.11.2 (2021-04-27) + +### Security (5 changes) + +- Prevent tokens with only read_api scope from executing mutations. +- 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.11.1 (2021-04-22) ### Changed (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 9c43b91bbd2..07ae670e11e 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.11.1 \ No newline at end of file +13.11.2 \ 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/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 -- cgit v1.2.1