Fix incorrect redirection when creating a PR fails #29537
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
wxiaoguang
added
type/bug
backport/v1.21
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/S
pull-request-size
bot
added
size/M
wxiaoguang
changed the title
|
I removed all these |
lunny
approved these changes
Mar 2, 2024
GiteaBot
added
lgtm/need 1
delvh
approved these changes
Mar 2, 2024
| @@ -1501,7 +1501,7 @@ func CompareAndPullRequestPost(ctx *context.Context) { | |||
| return | |||
| } | |||
| ctx.Flash.Error(flashError) | |||
| ctx.JSONRedirect(pullIssue.Link()) // FIXME: it's unfriendly, and will make the content lost | |||
| ctx.JSONRedirect(ctx.Link + "?" + ctx.Req.URL.RawQuery) // FIXME: it's unfriendly, and will make the content lost | |||
There was a problem hiding this comment.
Yes. See the description:
This is only a quick fix to make it easier to backport.
After this PR gets merged, I will propose a new PR to fix the FIXME.
There was a problem hiding this comment.
Yes, the filled form content will be lost because of the redirection. (The pull request title and content)
But it's the same behavior as before. So this can be resolved in future PR.
There was a problem hiding this comment.
-> Make PR form use toast to show error message #29545
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 2, 2024
This is only a quick fix to make it easier to backport. After this PR gets merged, I will propose a new PR to fix the FIXME. <details>  </details>
GiteaBot
added
backport/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 2, 2024
* upstream/main: Fix a bug returning 404 when display a single tag with no release (go-gitea#29466) Add a check for when the command is canceled by the program on Window… (go-gitea#29538) Fix incorrect redirection when creating a PR fails (go-gitea#29537) Fix incorrect subpath in links (go-gitea#29535) Fix issue link does not support quotes (go-gitea#29484) (go-gitea#29487)
silverwind
pushed a commit
that referenced
this pull request
Mar 2, 2024
Backport #29537 by wxiaoguang This is only a quick fix to make it easier to backport. Co-authored-by: wxiaoguang <[email protected]>
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.
This is only a quick fix to make it easier to backport.
After this PR gets merged, I will propose a new PR to fix the FIXME.