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 bug in getting merged pull request by commit (#32079) #32117

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Fix bug in getting merged pull request by commit (#32079) #32117

merged 4 commits into from
Sep 24, 2024

Conversation

Zettat123
Copy link
Contributor

Backport #32079

Fix #32027

@GiteaBot GiteaBot added this to the 1.22.3 milestone Sep 24, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 24, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 24, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Sep 24, 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 Sep 24, 2024
@yp05327
Copy link
Contributor

yp05327 commented Sep 24, 2024

image
Where is this?

@lunny
Copy link
Member

lunny commented Sep 24, 2024

image Where is this?

I think :sha is actually equal to sha here.

@yp05327
Copy link
Contributor

yp05327 commented Sep 24, 2024

It is equal, but the change not backport. 😕

@Zettat123
Copy link
Contributor Author

It is equal, but the change not backport. 😕

v1.22 does not have the ctx.PathParam method. So I just keep this line unchanged.

@yp05327
Copy link
Contributor

yp05327 commented Sep 24, 2024 •
edited
Loading

It is not does not have the ctx.PathParam method, just a rename, see #31405
ps: I'm using Gitlens to check the line history.
image

@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 Sep 24, 2024
@Zettat123
Copy link
Contributor Author

It is not does not have the ctx.PathParam method, just a rename, see #31405 ps: I'm using Gitlens to check the line history. image

I've fixed the :sha param. Please help review again, thanks

@yp05327
Copy link
Contributor

yp05327 commented Sep 24, 2024 •
edited
Loading

I have approved.
ps: Gitlens is not included in the dev container. Maybe we can add it.

@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 24, 2024
@lunny lunny merged commit 737c947 into go-gitea:release/v1.22 Sep 24, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 24, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yp05327 yp05327 yp05327 approved these changes

@wolfogre wolfogre wolfogre approved these changes

@lunny lunny lunny 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/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.3
Development

Successfully merging this pull request may close these issues.
5 participants
@Zettat123 @yp05327 @lunny @wolfogre @GiteaBot