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 push message behavior (#33215) #33317

Merged
merged 2 commits into from
Jan 19, 2025
Merged

Fix push message behavior (#33215) #33317

merged 2 commits into from
Jan 19, 2025

Conversation

wxiaoguang
Copy link
Contributor

Backport #33215

Manually resolved "reqctx" conflict

changchaishi and others added 2 commits January 18, 2025 10:33
@changchaishi @wxiaoguang
Fix push message behavior (go-gitea#33215)
51a83d6 
Fixes go-gitea#32769 by the logic from pr go-gitea#33192

---------

Co-authored-by: wxiaoguang <[email protected]>
# Conflicts:
#	services/repository/merge_upstream.go
@wxiaoguang
fix backport
53825d8
@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
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 18, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jan 18, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 18, 2025
Merged
@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
26 checks passed
@wxiaoguang wxiaoguang deleted the backport-push-message branch January 19, 2025 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zettat123 Zettat123 Zettat123 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/go Pull requests that update Go code modifies/templates This PR modifies the template files size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.2
Development

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