-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix bug automerge cannot be chosed when there is only 1 merge style #33040
Merged
lunny
merged 3 commits into
go-gitea:main
from
lunny:lunny/allow_automerge_only_1_mergestyle
Dec 30, 2024
Merged
Fix bug automerge cannot be chosed when there is only 1 merge style #33040
lunny
merged 3 commits into
go-gitea:main
from
lunny:lunny/allow_automerge_only_1_mergestyle
Dec 30, 2024
Conversation
This file contains 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
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Dec 30, 2024
pull-request-size
bot
added
the
size/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
label
Dec 30, 2024
4 tasks
hiifong
approved these changes
Dec 30, 2024
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
Dec 30, 2024
Zettat123
approved these changes
Dec 30, 2024
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
Dec 30, 2024
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Dec 30, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Dec 30, 2024
…o-gitea#33040) This is a quick bug fix. Even if there is only 1 merge style, the dropdown menu will still be displayed to allow users to choose auto-merge. Fix go-gitea#32448
GiteaBot
added
backport/done
All backports for this PR have been created
and removed
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
labels
Dec 30, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Dec 31, 2024
* giteaofficial/main: Fix issue comment number (go-gitea#30556) Fix duplicate co-author in squashed merge commit messages (go-gitea#33020) Merge updatecommentattachment functions (go-gitea#33044) Move SetMerged to service layer (go-gitea#33045) Remove aws go sdk package dependency (go-gitea#33029) Fix settings not being loaded at CLI (go-gitea#26402) Refactor fixture loading for testing (go-gitea#33024) Use gitrepo.GetTreePathLatestCommit to get file lastest commit instead from latest commit cache (go-gitea#32987) Fix bug automerge cannot be chosed when there is only 1 merge style (go-gitea#33040) use `-s -w` ldflags for release artifacts (go-gitea#33041)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport/done
All backports for this PR have been created
backport/v1.23
This PR should be backported to Gitea 1.23
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
modifies/frontend
size/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
type/bug
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.
This is a quick bug fix. Even if there is only 1 merge style, the dropdown menu will still be displayed to allow users to choose automerge.
Fix #32448