Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork6.3k
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
lunny approved these changesJul 7, 2025
Co-authored-by: posativ
hiifong approved these changesJul 8, 2025
4e10adc intogo-gitea:main 26 checks passed
Uh oh!
There was an error while loading.Please reload this page.
lunny pushed a commit to lunny/gitea that referenced this pull requestJul 8, 2025
…go-gitea#34989)Fixgo-gitea#34988Co-authored-by: posativ
zjjhot added a commit to zjjhot/gitea that referenced this pull requestJul 9, 2025
* 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 requestJul 10, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
backport/doneAll backports for this PR have been created backport/v1.24This PR should be backported to Gitea 1.24 lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. modifies/goPull requests that update Go code type/bug
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading.Please reload this page.
Fix#34988
Co-authored-by: posativ