You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
zeripath e4e411821d
Abort merge if head has been updated before pressing merge (#18032)
* 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>
3 years ago
..
blob.go Move repofiles from modules/repofiles to services/repository/files (#17774) 3 years ago
branch.go Move repository model into models/repo (#17933) 3 years ago
collaborators.go Move repository model into models/repo (#17933) 3 years ago
commits.go Refactor HTTP request context (#17979) 3 years ago
file.go Move repository model into models/repo (#17933) 3 years ago
fork.go Some repository refactors (#17950) 3 years ago
git_hook.go Move macaron to chi (#14293) 4 years ago
git_ref.go Multiple Escaping Improvements (#17551) 3 years ago
hook.go Move accessmode into models/perm (#17828) 3 years ago
hook_test.go Decouple unit test, remove intermediate `unittestbridge` package (#17662) 3 years ago
issue.go Move user related model into models/user (#17781) 3 years ago
issue_comment.go [API] generalize list header (#16551) 3 years ago
issue_label.go Calculate label URL on API (#16186) 3 years ago
issue_reaction.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
issue_stopwatch.go Fix close issue but time watcher still running (#17643) 3 years ago
issue_subscription.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
issue_tracked_time.go Move user related model into models/user (#17781) 3 years ago
key.go Move keys to models/asymkey (#17917) 3 years ago
label.go Calculate label URL on API (#16186) 3 years ago
language.go Move repository model into models/repo (#17933) 3 years ago
main_test.go Decouple unit test code from business code (#17623) 3 years ago
migrate.go Some repository refactors (#17950) 3 years ago
milestone.go [API] generalize list header (#16551) 3 years ago
mirror.go Move unit into models/unit/ (#17576) 3 years ago
notes.go Add an api endpoint to fetch git notes (#15373) (#16649) 3 years ago
pull.go Abort merge if head has been updated before pressing merge (#18032) 3 years ago
pull_review.go Move user related model into models/user (#17781) 3 years ago
release.go Move accessmode into models/perm (#17828) 3 years ago
release_attachment.go Move attachment into models/repo/ (#17650) 3 years ago
release_tags.go [API] Add delete release by tag & fix unreleased inconsistency (#14563) 3 years ago
repo.go Some repository refactors (#17950) 3 years ago
repo_test.go Move repository model into models/repo (#17933) 3 years ago
star.go Some repository refactors (#17950) 3 years ago
status.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
subscriber.go Some repository refactors (#17950) 3 years ago
tag.go [API] generalize list header (#16551) 3 years ago
teams.go Move repository model into models/repo (#17933) 3 years ago
topic.go Some repository refactors (#17950) 3 years ago
transfer.go Some repository refactors (#17950) 3 years ago
tree.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago
wiki.go Add missing `X-Total-Count` and fix some related bugs (#17968) 3 years ago