Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640
Attach a file by drag & drop or click to upload
