Fix manual merge form and 404 page templates #30000
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/XS
github-actions
bot
added
the
modifies/templates
wxiaoguang
force-pushed
the
backport-tmpl-fix
branch
from
3cc6f2a
to
d8fb087
Compare
pull-request-size
bot
added
size/S
lunny
reviewed
Mar 22, 2024
|
Off-topic: 30000 achievement unlocked! |
lunny
approved these changes
Mar 22, 2024
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
Mar 22, 2024
GiteaBot
added
lgtm/done
TKaxv-7S
added a commit
to TKaxv-7S/gitea
that referenced
this pull request
Apr 10, 2024
v1.21.10 * BUGFIXES * Fix Add/Remove WIP on pull request title failure (go-gitea#29999) (go-gitea#30066) * Fix misuse of `TxContext` (go-gitea#30061) (go-gitea#30062) * Respect DEFAULT_ORG_MEMBER_VISIBLE setting when adding creator to org (go-gitea#30013) (go-gitea#30035) * Escape paths for find file correctly (go-gitea#30026) (go-gitea#30031) * Remove duplicate option in admin screen and now-unused translation keys (go-gitea#28492) (go-gitea#30024) * Fix manual merge form and 404 page templates (go-gitea#30000) # gpg: Signature made Tue, Mar 26, 2024 7:48:36 AM # gpg: using EDDSA key 8722B61D72341082553B201CB8BE6D610E61C862 # gpg: Can't check signature: No public key
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partially backport #29985, fix some template errors.
The manual-merge form:
The 404 page: