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	[API] List limited and private orgs if authentificated (#16866)	2021-08-30 14:00:59 -04:00
misc
notify	[API] generalize list header (#16551)	2021-08-12 14:43:08 +02:00
org	[API] List limited and private orgs if authentificated (#16866)	2021-08-30 14:00:59 -04:00
repo	Ensure that rebase conflicts are handled in updates (#16952)	2021-09-05 10:30:40 +01:00
settings	Add custom emoji support (#16004)	2021-06-29 16:28:38 +02:00
swagger	Add an api endpoint to fetch git notes (#15373) (#16649)	2021-08-11 03:01:40 +02:00
user	[API] List limited and private orgs if authentificated (#16866)	2021-08-30 14:00:59 -04:00
utils	Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)	2021-08-11 02:31:13 +02:00
api.go	Add an api endpoint to fetch git notes (#15373) (#16649)	2021-08-11 03:01:40 +02:00