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

Auto merge pull requests when all checks succeeded via WebUI #19621

Closed
6543 opened this issue May 5, 2022 · 3 comments · Fixed by #19648
Closed

Auto merge pull requests when all checks succeeded via WebUI #19621

6543 opened this issue May 5, 2022 · 3 comments · Fixed by #19648
Labels
topic/ui Change the appearance of the Gitea UI type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Milestone
1.17.0

Comments

@6543
Copy link
Member

6543 commented May 5, 2022 •
edited
Loading

to work use #19648 or rewrite ...

Bildschirmfoto zu 2021-04-10 15-00-20

Bildschirmfoto zu 2021-04-10 15-03-24
@6543 6543 mentioned this issue May 5, 2022
Merged
19 tasks
@6543 6543 added type/feature Completely new functionality. Can only be merged if feature freeze is not active. topic/ui Change the appearance of the Gitea UI labels May 5, 2022
@wxiaoguang
Copy link
Contributor

Copy the comments here (some thoughts about how to refactor this UI):

Either rewrite the merge form with Vue.

Or, just add an checkbox Auto merge when succeed to merge UI, then these code do not need to be copied twice.

  • When the PR is merge-able, hide the chekcbox, show merge buttons.
  • When the PR is not merge-able, show the checkbox and hide merge buttons. Only when the checkbox is checked, then show the merge buttons.

(ps: the checkbox could be some other component, maybe switch between AutoMerge and ManualMerge)

This was referenced May 7, 2022
Merged
Closed
6543 added a commit that referenced this issue Jun 11, 2022
@6543 @wxiaoguang @delvh
Auto merge pull requests when all checks succeeded via WebUI (#19648)
a9cc9c0 
Add WebUI part of Auto merge feature

close #19621

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
@6543 6543 added this to the 1.17.0 milestone Jun 11, 2022
@viceice
Copy link
Contributor

viceice commented Aug 1, 2022

Any idea why the automerge feature isn't visuble to me?
image

I thought for admins both options shoulod be available 🤔

@6543
Copy link
Member Author

6543 commented Aug 1, 2022 •
edited
Loading

please open a new issue or chat via matrix/discord first ...

if you open a issue, of course link to this issue :)

my guess: you did not protect the target branch

@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2022
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this issue Aug 24, 2022
@6543 @wxiaoguang
@delvh @AbdulrhmnGhanem
Auto merge pull requests when all checks succeeded via WebUI (go-gite…
5f06e7f 
…a#19648)

Add WebUI part of Auto merge feature

close go-gitea#19621

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
topic/ui Change the appearance of the Gitea UI type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.17.0
Development

Successfully merging a pull request may close this issue.

Auto merge pull requests when all checks succeeded via WebUI 6543-forks/gitea
3 participants
@viceice @wxiaoguang @6543