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
..
activity.go
attachment.go
blame.go
branch.go	Fix branch pagination error (#16805)	2021-08-24 23:15:07 +01:00
commit.go	Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894)	2021-08-31 06:16:23 +02:00
compare.go	Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899)	2021-08-31 08:43:31 +01:00
download.go
editor.go
editor_test.go
http.go
http_test.go
issue.go	Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899)	2021-08-31 08:43:31 +01:00
issue_dependency.go
issue_label.go
issue_label_test.go
issue_lock.go
issue_stopwatch.go
issue_test.go
issue_timetrack.go
issue_watch.go
lfs.go
main_test.go
middlewares.go
migrate.go
milestone.go	In Render tolerate not being passed a context (#16842)	2021-08-28 21:15:56 +01:00
projects.go	In Render tolerate not being passed a context (#16842)	2021-08-28 21:15:56 +01:00
projects_test.go
pull.go	Ensure that rebase conflicts are handled in updates (#16952)	2021-09-05 10:30:40 +01:00
pull_review.go
release.go	Paginate releases page & set default page size to 10 (#16857)	2021-08-29 18:25:16 +02:00
release_test.go
repo.go
search.go
setting.go	Add missing return to handleSettingRemoteAddrError (#16794)	2021-08-23 18:09:25 -04:00
setting_protected_branch.go
settings_test.go
tag.go
topic.go
view.go
webhook.go
wiki.go	Ensure wiki repos are all closed (#16886)	2021-08-30 22:50:35 +02:00
wiki_test.go