Skip to content

Fix bug when viewing the commit diff page with non-ANSI files#36149

Merged
wxiaoguang merged 7 commits intogo-gitea:mainfrom
lunny:lunny/fix_commit_diff_non-ansi
Dec 13, 2025
Merged

Fix bug when viewing the commit diff page with non-ANSI files#36149
wxiaoguang merged 7 commits intogo-gitea:mainfrom
lunny:lunny/fix_commit_diff_non-ansi

Conversation

@lunny
Copy link
Copy Markdown
Member

@lunny lunny commented Dec 13, 2025

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 13, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 13, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 13, 2025
@wxiaoguang wxiaoguang force-pushed the lunny/fix_commit_diff_non-ansi branch from af5e329 to 68d0253 Compare December 13, 2025 09:25
@wxiaoguang wxiaoguang force-pushed the lunny/fix_commit_diff_non-ansi branch from 68d0253 to 12a737e Compare December 13, 2025 09:30
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Dec 13, 2025
@wxiaoguang wxiaoguang force-pushed the lunny/fix_commit_diff_non-ansi branch from 9539bf2 to 5a520d5 Compare December 13, 2025 11:14
@wxiaoguang
Copy link
Copy Markdown
Contributor

Found a lot of legacy bugs. The minimal backport is #36150

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 13, 2025
@wxiaoguang wxiaoguang force-pushed the lunny/fix_commit_diff_non-ansi branch from fb0705b to b294923 Compare December 13, 2025 11:47
@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Dec 13, 2025
@wxiaoguang wxiaoguang force-pushed the lunny/fix_commit_diff_non-ansi branch from ba8cc1b to 87d1fe5 Compare December 13, 2025 12:40
@wxiaoguang wxiaoguang merged commit 29057ea into go-gitea:main Dec 13, 2025
23 checks passed
@wxiaoguang wxiaoguang deleted the lunny/fix_commit_diff_non-ansi branch December 13, 2025 13:54
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 15, 2025
* giteaofficial/main:
  Remove undocumented support of signing key in the repository git configuration file (go-gitea#36143)
  Enable gocheckcompilerdirectives linter (go-gitea#36156)
  Fix code highlighting on blame page (go-gitea#36157)
  Check user visibility when redirecting to a renamed user (go-gitea#36148)
  Fix bug when viewing the commit diff page with non-ANSI files (go-gitea#36149)
  Refactor `FileTreeItem` type (go-gitea#36137)
  Fix various bugs (go-gitea#36139)
  Fix issue close timeline icon (go-gitea#36138)
  Add permissions to`files-changed` jobs (go-gitea#36142)
  Add explicit permissions to all actions workflows (go-gitea#36140)
  Bump `actions/checkout` to v6 (go-gitea#36136)
  Hide RSS icon when viewing a file not under a branch (go-gitea#36135)
  Fix SVG size calulation, only use `style` attribute (go-gitea#36133)
  Add sorting/filtering to admin user search API endpoint (go-gitea#36112)
silverwind added a commit to silverwind/gitea that referenced this pull request Dec 16, 2025
* origin/main:
  fix webAuthn insecure error view (go-gitea#36165)
  Some small refactors (go-gitea#36163)
  Remove undocumented support of signing key in the repository git configuration file (go-gitea#36143)
  Enable gocheckcompilerdirectives linter (go-gitea#36156)
  Fix code highlighting on blame page (go-gitea#36157)
  Check user visibility when redirecting to a renamed user (go-gitea#36148)
  Fix bug when viewing the commit diff page with non-ANSI files (go-gitea#36149)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Mar 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Display of files in Windows-1251 encoding is broken in diff view #35439

5 participants