opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-10-25 03:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Abort merge if head has been updated before pressing merge (#18032)

Browse Source 
* Abort merge if head has been updated before pressing merge

It is possible that a PR head may be pushed to between the merge page being shown
and the merge button being pressed. Pass the current expected head in as a parameter
and cancel the merge if it has changed.

Fix #18028

Signed-off-by: Andrew Thornton <art27@cantab.net>

* adjust swagger

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix test

Signed-off-by: Andrew Thornton <art27@cantab.net>

* placate lint

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath
2021-12-20 00:32:54 +00:00
committed by GitHub
parent b24a965b81
commit e4e411821d
9 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/swagger/v1_json.tmpl
View File

@ -15674,6 +15674,10 @@
"force_merge": {
"type": "boolean",
"x-go-name": "ForceMerge"
},
"head_commit_id": {
"type": "string",
"x-go-name": "HeadCommitID"
}
},
"x-go-name": "MergePullRequestForm",