Skip to content

Fix push message behavior (#33215)#33317

Merged
wxiaoguang merged 2 commits into
go-gitea:release/v1.23from
wxiaoguang:backport-push-message
Jan 19, 2025
Merged

Fix push message behavior (#33215)#33317
wxiaoguang merged 2 commits into
go-gitea:release/v1.23from
wxiaoguang:backport-push-message

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

Backport #33215

Manually resolved "reqctx" conflict

changchaishi and others added 2 commits January 18, 2025 10:33
Fixes go-gitea#32769 by the logic from pr go-gitea#33192

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
# Conflicts:
#	services/repository/merge_upstream.go
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 18, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 18, 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 Jan 18, 2025
@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 Jan 19, 2025
@wxiaoguang wxiaoguang merged commit 8d9ea68 into go-gitea:release/v1.23 Jan 19, 2025
@wxiaoguang wxiaoguang deleted the backport-push-message branch January 19, 2025 02:48
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Apr 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants