Skip to content

Conversation

@lunny
Copy link
Member

@lunny lunny commented Oct 6, 2025

Frontport from #35339

@lunny lunny added this to the 1.25.0 milestone Oct 6, 2025
@lunny lunny added the type/bug label Oct 6, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 6, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Oct 6, 2025
@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 Oct 10, 2025
@wxiaoguang
Copy link
Contributor

The main fix isn't merged yet, the backports are there? Move request review functions to pull service package #35337

Doesn't it violate the development workflow?

@lunny
Copy link
Member Author

lunny commented Oct 16, 2025

The main fix isn't merged yet, the backports are there? Move request review functions to pull service package #35337

Doesn't it violate the development workflow?

#35337 includes many refactors but this PR only fix the bugs. So it's a partial backport.

@wxiaoguang
Copy link
Contributor

The main fix isn't merged yet, the backports are there? Move request review functions to pull service package #35337
Doesn't it violate the development workflow?

#35337 includes many refactors but this PR only fix the bugs. So it's a partial backport.

What ever you explain, I don't think it is the expected result that "a bug has been fixed in 1.24 for two months, but 1.25 just got its unmerged PR a few days before, and no idea when 1.26 can get its fix".

@lunny
Copy link
Member Author

lunny commented Oct 17, 2025

The main fix isn't merged yet, the backports are there? Move request review functions to pull service package #35337
Doesn't it violate the development workflow?

#35337 includes many refactors but this PR only fix the bugs. So it's a partial backport.

What ever you explain, I don't think it is the expected result that "a bug has been fixed in 1.24 for two months, but 1.25 just got its unmerged PR a few days before, and no idea when 1.26 can get its fix".

The wrong behavior is merging #35339 before #35337. At that time, the target of #35337 is for 1.25.
At the moment, I think we have to frontport #35339 to v1.25 and review #35337 ASAP.

@lunny
Copy link
Member Author

lunny commented Oct 22, 2025

#35337

Sent #35723 to the main branch

@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 Oct 24, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 24, 2025
@lunny lunny enabled auto-merge (squash) October 24, 2025 18:44
@lunny lunny merged commit 123c8d2 into go-gitea:release/v1.25 Oct 24, 2025
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 Oct 24, 2025
@xnox xnox mentioned this pull request Dec 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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 type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants