You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
4 years ago
..
admin List limited and private orgs if authenticated on API (#16866) (#16879) 4 years ago
misc Refactor renders (#15175) 4 years ago
notify [API] expose repo.GetReviewers() & repo.GetAssignees() (#16168) 4 years ago
org List limited and private orgs if authenticated on API (#16866) (#16879) 4 years ago
repo Ensure that rebase conflicts are handled in updates (#16952) (#16960) 4 years ago
settings Add custom emoji support (#16004) 4 years ago
swagger Swagger AccessToken fixes (#16574) (#16597) 4 years ago
user List limited and private orgs if authenticated on API (#16866) (#16879) 4 years ago
utils Let branch/tag name be a valid ref to get CI status (#16400) 4 years ago
api.go Set AllowedHeaders on API CORS handler (#16524) (#16618) 4 years ago