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
..
admin	Improve SMTP authentication and Fix user creation bugs (#16612)	2021-08-11 21:42:58 +01:00
dev	Refactor routers directory (#15800)	2021-06-09 01:33:54 +02:00
events	Add an abstract json layout to make it's easier to change json library (#16528)	2021-07-24 18:03:58 +02:00
explore	Related refactors to ctx.FormX functions (#16567)	2021-08-11 18:08:52 +03:00
org	Add modals to Organization and Team remove/leave (#16471)	2021-08-26 22:57:40 -04:00
repo	Ensure that rebase conflicts are handled in updates (#16952)	2021-09-05 10:30:40 +01:00
user	Correctly return the number of Repositories for Organizations (#16807)	2021-09-01 01:31:42 -04:00
base.go	Allow setting X-FRAME-OPTIONS (#16643)	2021-08-06 16:47:10 -04:00
goget.go	Related refactors to ctx.FormX functions (#16567)	2021-08-11 18:08:52 +03:00
home.go	Refactor routers directory (#15800)	2021-06-09 01:33:54 +02:00
metrics.go	Refactor routers directory (#15800)	2021-06-09 01:33:54 +02:00
swagger_json.go	Refactor routers directory (#15800)	2021-06-09 01:33:54 +02:00
web.go	Fix wiki raw commit diff/patch view (#16891)	2021-08-31 04:22:54 +02:00