Skip to content

Trivial fixes (#33304)#33312

Merged
lunny merged 1 commit into
go-gitea:release/v1.23from
wxiaoguang:backport-fix-misc
Jan 17, 2025
Merged

Trivial fixes (#33304)#33312
lunny merged 1 commit into
go-gitea:release/v1.23from
wxiaoguang:backport-fix-misc

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

Backport #33304

The only conflict is caused by templates/shared/issueicon.tmpl

1. the error check was added for go-git, it was caused by the empty `.keep` file in the test fixtures.
2. use `PostFormValue` instead of `PostForm.Get` (`Get` needs to parse the form ahead)
3. fix incorrect container text (it should show "Images" in the header but not "OS/Arch")
4. align maven xml
5. fix closed PR color&icon
# Conflicts:
#	templates/shared/issueicon.tmpl
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 17, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 17, 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 Jan 17, 2025
@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 Jan 17, 2025
@lunny lunny merged commit bf664c2 into go-gitea:release/v1.23 Jan 17, 2025
@wxiaoguang wxiaoguang deleted the backport-fix-misc branch January 18, 2025 01:59
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Apr 18, 2025
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants