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

Adjust automerge buttons to reduce the steps and also fix cannot do automerge if there is only one mergestyle #31917

Closed
wants to merge 1 commit into from

Conversation

lunny
Copy link
Member

@lunny lunny commented Aug 24, 2024

Fix #32448

  • If there is only one merge style, the automerge icon will not be displayed.
    This PR added the same clock icon on the merge button if there is only one merge style to allow auto-merge.
  • And this PR also removed the step of choosing the merge style. With one click some mergestyle it will come to the confirmation UI immediately.
  • After entering autom-merge status, there is only one cancel button but hide merge directly buttons. That means users have to cancel auto-merge first and then do manually merge operation. The behaviour will keep consistent as Github's .
  • Add border radius for the hover auto-merge menus.

@lunny lunny added type/bug topic/ui Change the appearance of the Gitea UI labels Aug 24, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 24, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 24, 2024
@lunny lunny added docs-update-needed The document needs to be updated synchronously and removed docs-update-needed The document needs to be updated synchronously labels Aug 26, 2024
@lunny
Copy link
Member Author

lunny commented Dec 30, 2024

Close as this needs more discussions. And the bug will be fixed by #33040

@lunny lunny closed this Dec 30, 2024
@lunny lunny deleted the lunny/automerge_ui branch December 30, 2024 00:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/js size/S Denotes a PR that changes 10-29 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot automerge if there is only one merge style
3 participants