Skip to content

Merge with `security/master` after v15.3.5 security release

While we've already merged security/master into our tree via 08c88a2c (Merge branch 'sync-canonical-with-security-changes' into 'master', 2022-11-02), that commit merged with 702f036e (Update changelog for 15.3.5, 2022-11-02). This is not the commit that ultimately landed in the security/master branch though, but it instead is ef59e59f (Update changelog for 15.3.5, 2022-11-02), which is a rebased version of the former commit.

Because we have merged the wrong commit we now still see merge conflicts in the Auto-Update bot for Gitaly. Let's fix this by merging the correct commit, even though this doesn't bring any changes into our tree.

Merge request reports