1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
gitea/routers
zeripath eb0330a3fe
Ensure that rebase conflicts are handled in updates (#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 10:30:40 +01:00
..
api/v1 Ensure that rebase conflicts are handled in updates (#16952) 2021-09-05 10:30:40 +01:00
common Rename context.Query to context.Form (#16562) 2021-07-29 03:42:15 +02:00
install Allow setting X-FRAME-OPTIONS (#16643) 2021-08-06 16:47:10 -04:00
private Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05: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) 2021-09-05 10:30:40 +01:00
init.go Refactor: Move login out of models (#16199) 2021-07-24 11:16:34 +01:00