aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code
e4e411821d
gitea/routers/web/repo
History
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>
2021-12-20 08:32:54 +08:00
..
activity.go Move unit into models/unit/ (#17576) 2021-11-09 20:57:58 +01:00
attachment.go Move attachment into models/repo/ (#17650) 2021-11-19 21:39:57 +08:00
blame.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
branch.go Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
commit.go Add missing X-Total-Count and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
compare.go Support open compare page directly (#17975) 2021-12-17 22:20:27 +00:00
download.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
editor_test.go Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
editor.go Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
http_test.go
http.go Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
issue_content_history.go Move unit into models/unit/ (#17576) 2021-11-09 20:57:58 +01:00
issue_dependency.go Rename context.Query to context.Form (#16562) 2021-07-29 03:42:15 +02:00
issue_label_test.go Decouple unit test, remove intermediate unittestbridge package (#17662) 2021-11-16 16:53:21 +08:00
issue_label.go Use a standalone struct name for Organization (#17632) 2021-11-19 19:41:40 +08:00
issue_lock.go
issue_stopwatch.go Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
issue_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
issue_timetrack.go
issue_watch.go
issue.go Add option to define refs in issue templates (#17842) 2021-12-17 21:29:09 +00:00
lfs.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
main_test.go Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
middlewares.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
migrate.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
milestone.go Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
projects_test.go Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
projects.go Use JSON module instead of stdlib json (#18003) 2021-12-17 09:15:02 +08:00
pull_review.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 2021-08-11 02:31:13 +02:00
pull.go Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
release_test.go Decouple unit test, remove intermediate unittestbridge package (#17662) 2021-11-16 16:53:21 +08:00
release.go Clean legacy SimpleMDE code (#17926) 2021-12-10 10:51:27 +08:00
repo.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
search.go Related refactors to ctx.FormX functions (#16567) 2021-08-11 18:08:52 +03:00
setting_protected_branch.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
setting.go Add Reindex buttons to repository settings page (#17494) 2021-12-16 23:55:12 +08:00
settings_test.go Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00
tag.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
topic.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
view.go Shorten page title in file view (#17987) 2021-12-15 15:50:11 +08:00
webhook.go Move accessmode into models/perm (#17828) 2021-11-28 12:58:28 +01:00
wiki_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
wiki.go Clean legacy SimpleMDE code (#17926) 2021-12-10 10:51:27 +08:00