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

..

blob.go

Swagger info corrections (#9441)

2019-12-20 19:07:12 +02:00

branch.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

collaborators.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

commits.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

file.go

Rename context.Query to context.Form (#16562)

2021-07-29 03:42:15 +02:00

fork.go

Refactor the fork service slightly to take ForkRepoOptions (#16744)

2021-08-28 16:37:14 +08:00

git_hook.go

Move macaron to chi (#14293)

2021-01-26 16:36:53 +01:00

git_ref.go

Let branch/tag name be a valid ref to get CI status (#16400)

2021-07-13 08:14:14 +01:00

hook_test.go

API endpoint for testing webhook (#3550)

2018-04-29 14:21:33 +08:00

hook.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

issue_comment.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

issue_label.go

Move macaron to chi (#14293)

2021-01-26 16:36:53 +01:00

issue_reaction.go

[refactor] Unify the export of user data via API (#15144)

2021-03-27 17:45:26 +01:00

issue_stopwatch.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

issue_subscription.go

[refactor] Unify the export of user data via API (#15144)

2021-03-27 17:45:26 +01:00

issue_tracked_time.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

issue.go

Add filter by owner and team to issue/pulls search endpoint (#16662)

2021-08-13 22:47:25 +02:00

key.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

label.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

language.go

Add language statistics API endpoint (#11737)

2020-06-07 14:48:41 +03:00

main_test.go

API endpoint for testing webhook (#3550)

2018-04-29 14:21:33 +08:00

migrate.go

Add Status Updates whilst Gitea migrations are occurring (#15076)

2021-06-16 18:02:24 -04:00

milestone.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

mirror.go

Refactor api repo dir (#10048)

2020-01-29 13:55:23 +08:00

notes.go

Add an api endpoint to fetch git notes (#15373) (#16649)

2021-08-11 03:01:40 +02:00

pull_review.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

pull.go

Ensure that rebase conflicts are handled in updates (#16952)

2021-09-05 10:30:40 +01:00

release_attachment.go

Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)

2021-08-11 02:31:13 +02:00

release_tags.go

[API] Add delete release by tag & fix unreleased inconsistency (#14563)

2021-02-07 19:32:18 +01:00

release.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

repo_test.go

Move macaron to chi (#14293)

2021-01-26 16:36:53 +01:00

repo.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

star.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

status.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

subscriber.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

tag.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

teams.go

[API] List, Check, Add & delete endpoints for repository teams (#13630)

2021-02-01 22:57:12 +01:00

topic.go

[API] generalize list header (#16551)

2021-08-12 14:43:08 +02:00

transfer.go

Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)

2021-03-01 01:47:30 +01:00

tree.go

Rename context.Query to context.Form (#16562)

2021-07-29 03:42:15 +02:00