Skip to content

Start automerge check again after the conflict check and the schedule #34989

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
Merged
merged 4 commits into from
Jul 8, 2025
Merged

Start automerge check again after the conflict check and the schedule #34989

merged 4 commits into from
Jul 8, 2025

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jul 7, 2025 •
edited
Loading

Fix #34988

Co-authored-by: posativ

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 7, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jul 7, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jul 7, 2025
Closed
@wxiaoguang wxiaoguang added backport/v1.24 This PR should be backported to Gitea 1.24 type/bug labels Jul 7, 2025
@wxiaoguang wxiaoguang added this to the 1.25.0 milestone Jul 7, 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 Jul 7, 2025
@wxiaoguang wxiaoguang changed the title Start automerge check again after the conflict check Start automerge check again after the conflict check and the schedule Jul 8, 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 Jul 8, 2025
@wxiaoguang wxiaoguang enabled auto-merge (squash) July 8, 2025 14:23
@wxiaoguang wxiaoguang merged commit 4e10adc into go-gitea:main Jul 8, 2025
26 checks passed
@wxiaoguang wxiaoguang deleted the fix-automerge branch July 8, 2025 14:51
lunny pushed a commit to lunny/gitea that referenced this pull request Jul 8, 2025
@wxiaoguang @lunny
Start automerge check again after the conflict check and the schedule (…
bc87789 
…go-gitea#34989)

Fix go-gitea#34988

Co-authored-by: posativ
@lunny lunny mentioned this pull request Jul 8, 2025
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Jul 8, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 9, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
158f99e 
* giteaofficial/main:
  Refactor mail template and support preview (go-gitea#34990)
  [skip ci] Updated translations via Crowdin
  Fix bug when displaying git user avatar in commits list (go-gitea#35003)
  Tweak placement of diff file menu (go-gitea#34999)
  Start automerge check again after the conflict check and the schedule (go-gitea#34989)
  Refactor time tracker UI (go-gitea#34983)
  [skip ci] Updated translations via Crowdin
  Improve NuGet API Parity (go-gitea#21291) (go-gitea#34940)
wxiaoguang added a commit that referenced this pull request Jul 10, 2025
@lunny @wxiaoguang
Start automerge check again after the conflict check and the schedule (…
e931b62 
…#35002)

Fix #34988
Backport #34989 

Co-authored-by: posativ

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@hiifong hiifong hiifong approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 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
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

Automerge stuck with multiple repositories creating PRs around the same time
4 participants
@wxiaoguang @lunny @hiifong @GiteaBot