Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some pending problems #29985

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix some pending problems #29985

merged 1 commit into from
Mar 22, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Mar 22, 2024 •
edited
Loading

These changes are quite independent and trivial, so I don't want to open too many PRs.

image

@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Mar 22, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 22, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 22, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Mar 22, 2024
This was referenced Mar 22, 2024
Closed
Merged
Merged
@wxiaoguang wxiaoguang added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Mar 22, 2024
@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 Mar 22, 2024
@wxiaoguang wxiaoguang mentioned this pull request Mar 22, 2024
Merged
@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 Mar 22, 2024
@wxiaoguang wxiaoguang merged commit 226231e into go-gitea:main Mar 22, 2024
26 checks passed
@wxiaoguang wxiaoguang deleted the fix-various branch March 22, 2024 11:17
wxiaoguang added a commit that referenced this pull request Mar 22, 2024
@wxiaoguang
Fix manual merge form and 404 page templates (#30000)
24c66c5 
Partially backport #29985, fix some template errors.

* fix the manual-merge form
* fix the 404 page
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
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 modifies/js modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wxiaoguang @lunny @silverwind @GiteaBot