1
1
mirror of https://github.com/go-gitea/gitea synced 2024-12-25 01:54:26 +00:00
gitea/routers
zeripath e5ded0ee19
Ensure that rebase conflicts are handled in updates (#16952) (#16960)
Backport #16952

PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix #16922

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-09-05 18:54:13 +02:00
..
api/v1 Ensure that rebase conflicts are handled in updates (#16952) (#16960) 2021-09-05 18:54:13 +02:00
common Support custom mime type mapping for text files (#16304) 2021-06-30 17:31:54 -04:00
install just add some unit tests (#16291) 2021-06-29 22:00:02 +01:00
private Restore functionality for pushing non-standard refs (Partial #16705) (#16706) 2021-08-17 10:24:47 +02:00
utils just add some unit tests (#16291) 2021-06-29 22:00:02 +01:00
web Ensure that rebase conflicts are handled in updates (#16952) (#16960) 2021-09-05 18:54:13 +02:00
init.go Add LRU mem cache implementation (#16226) 2021-07-10 23:54:15 +02:00