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.

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
merged 3 commits into from
Dec 30, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 30, 2024

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

@lunny lunny added type/bug backport/v1.23 This PR should be backported to Gitea 1.23 labels Dec 30, 2024
@GiteaBot 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 pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 30, 2024
@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 Dec 30, 2024
@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 Dec 30, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 30, 2024
@lunny lunny enabled auto-merge (squash) December 30, 2024 02:51
@lunny lunny merged commit 344c89e into go-gitea:main Dec 30, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone 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 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
lunny added a commit that referenced this pull request Dec 30, 2024
…33040) (#33043)

Backport #33040 by @lunny

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

Co-authored-by: Lunny Xiao <[email protected]>
@lunny lunny deleted the lunny/allow_automerge_only_1_mergestyle branch December 30, 2024 06:44
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot automerge if there is only one merge style
4 participants