1
1
mirror of https://github.com/go-gitea/gitea synced 2024-12-25 18:14:28 +00:00
gitea/routers/api/v1
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
..
admin List limited and private orgs if authenticated on API (#16866) (#16879) 2021-08-31 12:49:02 +02:00
misc Refactor renders (#15175) 2021-04-19 18:25:08 -04:00
notify [API] expose repo.GetReviewers() & repo.GetAssignees() (#16168) 2021-06-17 16:02:34 +02:00
org List limited and private orgs if authenticated on API (#16866) (#16879) 2021-08-31 12:49:02 +02:00
repo Ensure that rebase conflicts are handled in updates (#16952) (#16960) 2021-09-05 18:54:13 +02:00
settings Add custom emoji support (#16004) 2021-06-29 16:28:38 +02:00
swagger Swagger AccessToken fixes (#16574) (#16597) 2021-08-02 20:24:47 +02:00
user List limited and private orgs if authenticated on API (#16866) (#16879) 2021-08-31 12:49:02 +02:00
utils Let branch/tag name be a valid ref to get CI status (#16400) 2021-07-13 08:14:14 +01:00
api.go Set AllowedHeaders on API CORS handler (#16524) (#16618) 2021-08-04 21:57:59 +02:00