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

Cannot automerge if there is only one merge style #32448

Closed
lunny opened this issue Nov 8, 2024 · 0 comments · Fixed by #33040
Closed

Cannot automerge if there is only one merge style #32448

lunny opened this issue Nov 8, 2024 · 0 comments · Fixed by #33040
Labels
type/bug
Milestone
1.23.0

Comments

@lunny
Copy link
Member

lunny commented Nov 8, 2024 •
edited
Loading

  1. When multiple merge styles are enabled in the repository settings, the “Merge Style” dropdown appears in the pull request (PR) view, allowing users to select the “Auto Merge” option. However, if only one merge style is enabled, the dropdown does not appear, preventing the selection of “Auto Merge.”

  2. Once auto merge is enabled, you can still choose auto merge from the merge style dropdown.
@lunny lunny added the type/bug label Nov 8, 2024
@lunny lunny mentioned this issue Nov 8, 2024
Closed
4 tasks
@lunny lunny mentioned this issue Dec 30, 2024
Merged
@lunny lunny added this to the 1.23.0 milestone Dec 30, 2024
@lunny lunny closed this as completed in 344c89e Dec 30, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this issue Dec 30, 2024
@lunny @GiteaBot
Fix bug automerge cannot be chosed when there is only 1 merge style (g…
47f265f 
…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 mentioned this issue Dec 30, 2024
Merged
lunny added a commit that referenced this issue Dec 30, 2024
@GiteaBot @lunny
Fix bug automerge cannot be chosed when there is only 1 merge style (#…
fef364e 
…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 <xiaolunwen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
1.23.0
1 participant
@lunny