• Robert Speicher's avatar
    Merge branch 'reject-merge-conflicts' into 'master' · bb937e7a
    Robert Speicher authored
    Properly abort a merge when merge conflicts occur
    
    If somehow a user attempted to accept a merge request that had conflicts (e.g. the "Accept Merge Request" button or the MR itself was not updated), `MergeService` did not properly detect that a conflict
    occurred. It would assume that the MR went through without any issues and close the MR as though everything was fine. This could cause data loss if the source branch were removed.
    
    Closes #20425
    
    See merge request !5569
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
    bb937e7a
To find the state of this project's repository at the time of any of these versions, check out the tags.
CHANGELOG 174 KB