Fix error display when merging PRs #29288
Merged
Conversation
This file contains hidden or 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
wolfogre
approved these changes
Feb 21, 2024
GiteaBot
added
lgtm/need 1
wxiaoguang
approved these changes
Feb 21, 2024
GiteaBot
added
lgtm/done
wolfogre
added
the
reviewed/wait-merge
delvh
approved these changes
Feb 21, 2024
Collaborator
|
I was unable to create a backport for 1.21. @Zettat123, please send one manually. 🍵 |
GiteaBot
added
backport/manual
Zettat123
added a commit
to Zettat123/gitea
that referenced
this pull request
Feb 22, 2024
Partially fix go-gitea#29071, regression of Modernize merge button go-gitea#28140 Fix some missing `Redirect` -> `JSONRedirect`. Thanks @yp05327 for the help in go-gitea#29071 (comment)
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 22, 2024
* giteaofficial/main: (32 commits) [skip ci] Updated translations via Crowdin Prevent double use of `git cat-file` session. (go-gitea#29298) Revert go-gitea#28753 because UI broken. (go-gitea#29293) Fix error display when merging PRs (go-gitea#29288) Refactor markup rendering to accept general "protocol:" prefix (go-gitea#29276) Remove jQuery from the installation page (go-gitea#29284) Always write proc-receive hook for all git versions (go-gitea#29287) Do not use `ctx.Doer` when reset password (go-gitea#29289) Update Discord logo (go-gitea#29285) [skip ci] Updated translations via Crowdin Remove jQuery .map() and enable eslint rules for it (go-gitea#29272) Explained where create issue/PR template (go-gitea#29035) (go-gitea#29266) Remove jQuery from repo wiki creation page (go-gitea#29271) Do not show delete button when time tracker is disabled (go-gitea#29257) Left align the input labels for the link account page (go-gitea#29255) [skip ci] Updated translations via Crowdin Remove jQuery from the repo migration form (go-gitea#29229) Fix content size does not match error when uploading lfs file (go-gitea#29259) Workaround to clean up old reviews on creating a new one (go-gitea#28554) Deduplicate translations for contributors graph (go-gitea#29256) ...
silverwind
pushed a commit
that referenced
this pull request
Feb 22, 2024
|
Automatically locked because of our CONTRIBUTING guidelines |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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 fix #29071, regression of Modernize merge button #28140
Fix some missing
Redirect->JSONRedirect.Thanks @yp05327 for the help in #29071 (comment)