Skip to content

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

Merged
wxiaoguang merged 2 commits intogo-gitea:release/v1.25from
wxiaoguang:fix-diff-charset-1.25
Dec 13, 2025
Merged

Fix bug when viewing the commit diff page with non-ANSI files (#36149)#36150
wxiaoguang merged 2 commits intogo-gitea:release/v1.25from
wxiaoguang:fix-diff-charset-1.25

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

Backport #36149

@GiteaBot GiteaBot added this to the 1.25.3 milestone 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
@wxiaoguang wxiaoguang force-pushed the fix-diff-charset-1.25 branch 2 times, most recently from c2b6332 to 215f783 Compare December 13, 2025 12:02
@wxiaoguang wxiaoguang force-pushed the fix-diff-charset-1.25 branch 2 times, most recently from 2338aa0 to d5dce15 Compare December 13, 2025 13:08
@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 fix-diff-charset-1.25 branch from d5dce15 to 29f4d6c Compare December 13, 2025 13:42
@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 merged commit c97b89a into go-gitea:release/v1.25 Dec 13, 2025
26 checks passed
@wxiaoguang wxiaoguang deleted the fix-diff-charset-1.25 branch December 13, 2025 17:14
@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

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.

4 participants