diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-03 12:37:21 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-11-03 12:43:32 +0300 |
commit | b25518af0fb0c4a37301ce45a713e2468280e255 (patch) | |
tree | 09743d19fbdacd3cbe99dc41c534203031cbd8fe | |
parent | 08c88a2c8a8334263e2afd186eabc42c79e60207 (diff) | |
parent | ef59e59f1a3705913f13cf558db9034ac14e7e7b (diff) |
Merge with `security/master` after v15.3.5 security release
While we've already merged security/master into our tree via 08c88a2c8
(Merge branch 'sync-canonical-with-security-changes' into 'master',
2022-11-02), that commit merged with 702f036ed (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 ef59e59f1 (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.
0 files changed, 0 insertions, 0 deletions