github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-11 14:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

require latest source sha as param for the merge API (#767)

Browse Source
This commit is contained in:
Marko Gacesa 2023-11-06 12:16:18 +00:00 committed by Harness
parent 3ad550ce69
commit e731c0fdff
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/pullreq/merge.go
View File

@ -94,13 +94,10 @@ func (c *Controller) Merge(
return nil, nil, usererror.BadRequest("Pull request must be open") return nil, nil, usererror.BadRequest("Pull request must be open")
} }
// TODO: Uncomment when the front-end side starts sending SourceSHA.
/*
if pr.SourceSHA != in.SourceSHA { if pr.SourceSHA != in.SourceSHA {
return nil, nil, return nil, nil,
usererror.BadRequest("A newer commit is available. Only the latest commit can be merged.") usererror.BadRequest("A newer commit is available. Only the latest commit can be merged.")
} }
*/
if pr.IsDraft { if pr.IsDraft {
return nil, nil, usererror.BadRequest( return nil, nil, usererror.BadRequest(