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.
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>
3 years ago
..
activity.go Refactor routers directory (#15800) 3 years ago
attachment.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
blame.go Replace `list.List` with slices (#16311) 3 years ago
branch.go Fix branch pagination error (#16805) 3 years ago
commit.go Repare and Improve GetDiffRangeWithWhitespaceBehavior (#16894) 3 years ago
compare.go Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) 3 years ago
download.go Download lfs in git and web workflow from minio/s3 directly (#16731) 3 years ago
editor.go Pre-fill suggested New File 'name' and 'content' with Query Params (#16556) 3 years ago
editor_test.go Refactor routers directory (#15800) 3 years ago
http.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
http_test.go Fix http path bug (#16117) 3 years ago
issue.go Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) 3 years ago
issue_dependency.go Rename context.Query to context.Form (#16562) 3 years ago
issue_label.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
issue_label_test.go Refactor routers directory (#15800) 3 years ago
issue_lock.go Refactor routers directory (#15800) 3 years ago
issue_stopwatch.go Refactor routers directory (#15800) 3 years ago
issue_test.go Refactor routers directory (#15800) 3 years ago
issue_timetrack.go Refactor routers directory (#15800) 3 years ago
issue_watch.go Refactor routers directory (#15800) 3 years ago
lfs.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
main_test.go Refactor routers directory (#15800) 3 years ago
middlewares.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
migrate.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
milestone.go In Render tolerate not being passed a context (#16842) 3 years ago
projects.go In Render tolerate not being passed a context (#16842) 3 years ago
projects_test.go Refactor routers directory (#15800) 3 years ago
pull.go Ensure that rebase conflicts are handled in updates (#16952) 3 years ago
pull_review.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
release.go Paginate releases page & set default page size to 10 (#16857) 3 years ago
release_test.go Refactor routers directory (#15800) 3 years ago
repo.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
search.go Related refactors to ctx.FormX functions (#16567) 3 years ago
setting.go Add missing return to handleSettingRemoteAddrError (#16794) 3 years ago
setting_protected_branch.go Rename ctx.Form() to ctx.FormString() and move code into own file (#16571) 3 years ago
settings_test.go Refactor routers directory (#15800) 3 years ago
tag.go Rename context.Query to context.Form (#16562) 3 years ago
topic.go Related refactors to ctx.FormX functions (#16567) 3 years ago
view.go [API] generalize list header (#16551) 3 years ago
webhook.go [API] generalize list header (#16551) 3 years ago
wiki.go Ensure wiki repos are all closed (#16886) 3 years ago
wiki_test.go Add TestPrepareWikiFileName (#16487) 3 years ago