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

..

activity.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

attachment.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

blame.go

Link to previous blames in file blame page (#16259)

2021-06-28 01:13:20 +02:00

branch.go

Fix branch pagination error (#16805) (#16816)

2021-08-25 11:11:54 +01:00

commit.go

Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) (#16895)

2021-08-31 05:02:27 +02:00

compare.go

Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900)

2021-08-31 16:06:01 +08:00

download.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

editor_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

editor.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

http_test.go

Fix http path bug (#16117)

2021-06-09 14:53:12 +02:00

http.go

Fix various documentation, user-facing, and source comment typos (#16367)

2021-07-08 13:38:13 +02:00

issue_dependency.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_label_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_label.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_lock.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_stopwatch.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_timetrack.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue_watch.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

issue.go

Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900)

2021-08-31 16:06:01 +08:00

lfs.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

main_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

middlewares.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

migrate.go

Add push to remote mirror repository (#15157)

2021-06-14 19:20:43 +02:00

milestone.go

In Render tolerate not being passed a context (#16842) (#16858)

2021-08-29 15:25:45 +01:00

projects_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

projects.go

In Render tolerate not being passed a context (#16842) (#16858)

2021-08-29 15:25:45 +01:00

pull_review.go

Add attachments for PR reviews (#16075)

2021-06-14 21:12:33 -04:00

pull.go

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

2021-09-05 18:54:13 +02:00

release_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

release.go

In Render tolerate not being passed a context (#16842) (#16858)

2021-08-29 15:25:45 +01:00

repo.go

Rework repository archive (#14723)

2021-06-23 17:12:38 -04:00

search.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

setting_protected_branch.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

setting.go

Add missing return to handleSettingRemoteAddrError (#16794) (#16795)

2021-08-23 18:09:28 -04:00

settings_test.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

tag.go

Add tag protection (#15629)

2021-06-25 16:28:55 +02:00

topic.go

Refactor routers directory (#15800)

2021-06-09 01:33:54 +02:00

view.go

Fix external renderer (#16401)

2021-07-12 17:13:59 -04:00

webhook.go

Implemented head_commit for webhooks (#16282)

2021-06-29 15:34:03 +02:00

wiki_test.go

Add TestPrepareWikiFileName (#16487) (#16498)

2021-07-21 03:37:00 +01:00

wiki.go

Ensure wiki repos are all closed (#16886) (#16888)

2021-08-30 23:00:45 +02:00