Zhaoqi XuandGitHub be7cde7539 fix(repo): surface unrelated histories on Sync Fork (#39258) ...

Sync Fork already maps merge conflicts to a JSON error. Unrelated
histories still went through `ServerError`, so the UI showed a 500 HTML
snippet instead of the same user-facing message PR merge already uses
(`repo.pulls.unrelated_histories`).

The API path returned 500 for the same git error; PR merge returns 409.
Match that.

Fixes #36772

AI assistance was used to locate the handler gap and draft the mapping.
I reviewed and take responsibility for the change.

Signed-off-by: Zhaoqi Xu <lzy00419@outlook.com>

2026-09-17 12:25:43 +00:00

..

actions

fix(actions): use gitea's clock for actions durations (#39323)

2026-09-16 06:53:15 +00:00

setting

chore: fix various problems (#39298)

2026-09-14 22:15:21 +02:00

activity.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

attachment.go

fix(attachments): enforce owning repository path (#39048)

2026-08-24 17:32:23 +00:00

blame.go

perf(gitdiff): optimize inline diff highlighting using cache (#38706)

2026-07-30 16:43:36 +00:00

branch.go

fix(repo): surface unrelated histories on Sync Fork (#39258)

2026-09-17 12:25:43 +00:00

code_frequency.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

commit.go

enhance: improve commit page header (#39229)

2026-09-06 11:27:04 +02:00

common_recentbranches.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

compare_test.go

fix(pulls): add branch-name option for DEFAULT_TITLE_SOURCE (#38356)

2026-07-07 07:08:05 +00:00

compare.go

fix: restore owner name in PR target branch selector (#39262)

2026-09-08 15:34:49 +00:00

contributors.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

download.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

editor_apply_patch.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

editor_cherry_pick.go

refactor: make git package handle all git operations (#38543)

2026-07-20 16:07:38 +00:00

editor_error.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

editor_fork.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

editor_preview.go

refactor: remove Ctx field from git.Repository (#38500)

2026-07-17 18:44:31 +08:00

editor_test.go

chore: still keep ctx in git.Repository struct for cat-file batch command (#38684)

2026-07-28 17:04:22 +00:00

editor_uploader.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

editor_util.go

refactor: make git package handle all git operations (#38543)

2026-07-20 16:07:38 +00:00

editor.go

fix(web): populate the reason for "cannot commit to branch" in web editor commit form (#39155)

2026-08-28 21:46:58 +00:00

fork.go

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

githttp_test.go

Enable testifylint rules (#34075)

2025-03-31 01:53:48 -04:00

githttp.go

feat: add deploy tokens (#37306)

2026-08-26 19:32:44 +00:00

helper.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_comment.go

fix: correct repo/attatchment absolute url and release layout (#39178)

2026-08-31 23:31:17 +00:00

issue_content_history.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_dependency.go

fix(repo): prevent double-write redirect collisions on dependency errors, fix ui (#38627)

2026-07-25 20:39:36 +08:00

issue_label_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_label.go

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

issue_list.go

fix: classify git failures on stderr, restrict migration failure detail (#39010)

2026-09-15 10:59:34 +02:00

issue_lock.go

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

issue_new.go

chore: form binding trim space (#38978)

2026-08-19 12:50:06 +00:00

issue_page_meta.go

fix: allow re-requesting uncounted review approvals (#38988)

2026-09-08 15:59:06 +00:00

issue_pin.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_poster.go

fix: org project view assignee list (#38357)

2026-07-07 14:40:12 +08:00

issue_stopwatch.go

feat: Replace SSE with WebSocket for UI notifications (#36965)

2026-07-27 07:46:00 +00:00

issue_suggestions.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue_timetrack.go

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

issue_view.go

fix: classify git failures on stderr, restrict migration failure detail (#39010)

2026-09-15 10:59:34 +02:00

issue_watch.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

issue.go

fix: correct repo/attatchment absolute url and release layout (#39178)

2026-08-31 23:31:17 +00:00

main_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

mention.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

middlewares_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

middlewares.go

refactor: decouple git.Repository(ctx) from git.Commit & git.Tree (#38464)

2026-07-15 17:30:01 +00:00

migrate.go

fix: classify git failures on stderr, restrict migration failure detail (#39010)

2026-09-15 10:59:34 +02:00

milestone.go

refactor: pagination/pager (#39162)

2026-08-29 08:20:46 +02:00

packages.go

refactor: pagination/pager (#39162)

2026-08-29 08:20:46 +02:00

projects.go

feat: Add audit logging (#38189)

2026-09-12 08:15:23 +00:00

pull_merge_box.go

feat(actions): support owner-level and global scoped workflows (#38154)

2026-06-28 09:31:35 +00:00

pull_merge_form.go

fix: make commit message merge correctly (#38490)

2026-07-17 07:44:05 +00:00

pull_review_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

pull_review.go

chore: enable forcetypeassert linter, fix issues (#38804)

2026-08-09 10:25:06 +00:00

pull.go

fix: restore owner name in PR target branch selector (#39262)

2026-09-08 15:34:49 +00:00

recent_commits.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

release_test.go

fix(release): validate web attachment renames against allowed types (#38314)

2026-07-04 15:02:17 +02:00

release.go

enhance: Improve validation errors for secrets/variables (#39221)

2026-09-04 00:28:58 +00:00

render.go

refactor: markup render (#38864)

2026-08-11 18:01:02 +02:00

repo.go

fix(web): populate the reason for "cannot commit to branch" in web editor commit form (#39155)

2026-08-28 21:46:58 +00:00

search.go

refactor: pagination/pager (#39162)

2026-08-29 08:20:46 +02:00

star.go

chore: fix repo watch (#38921)

2026-08-16 03:00:59 +00:00

topic.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

transfer.go

chore: fix repo watch (#38921)

2026-08-16 03:00:59 +00:00

treelist_test.go

feat(diff): Add search and extension filter to diff sidebar (#37068)

2026-08-23 18:31:22 +02:00

treelist.go

chore: misc go 1.27 tweaks (#39069)

2026-08-24 18:26:10 +00:00

view_file.go

fix(web): populate the reason for "cannot commit to branch" in web editor commit form (#39155)

2026-08-28 21:46:58 +00:00

view_home_test.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

view_home.go

feat(licenses): support REUSE specification in licenses (#38720)

2026-08-03 07:34:53 +00:00

view_readme.go

fix(web): populate the reason for "cannot commit to branch" in web editor commit form (#39155)

2026-08-28 21:46:58 +00:00

view_test.go

Implement FSFE REUSE for golang files (#21840)

2022-11-27 18:20:29 +00:00

view.go

chore: fix various problems (#39298)

2026-09-14 22:15:21 +02:00

watch.go

chore: fix repo watch (#38921)

2026-08-16 03:00:59 +00:00

webgit.go

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

2026-05-26 15:49:31 -07:00

wiki_test.go

refactor: wiki edit form (#38918)

2026-08-14 11:31:23 +02:00

wiki.go

chore: fix various problems (#39298)

2026-09-14 22:15:21 +02:00