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 #19648

Merged
merged 42 commits into from
Jun 11, 2022
Merged

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

merged 42 commits into from
Jun 11, 2022

Commits on May 7, 2022

  1. Revert "remove webUI part for another pull" 

    This reverts commit 9f43fc9.
    @6543
    6543 committed May 7, 2022
    Configuration menu
    Copy the full SHA
    abfeefe View commit details
    Browse the repository at this point in the history

  2. Revert "remove more WebUI only parts" 

    This reverts commit 6566141.
    @6543
    6543 committed May 7, 2022
    Configuration menu
    Copy the full SHA
    daf146a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2022

  1. ajust to go-gitea#19649

    @6543
    6543 authored May 8, 2022
    Configuration menu
    Copy the full SHA
    f1037f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 8, 2022
    Configuration menu
    Copy the full SHA
    847919d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2022

  1. Merge branch 'master' into auto-merge_webUI

    @6543
    6543 committed May 12, 2022
    Configuration menu
    Copy the full SHA
    efad877 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @wxiaoguang
    wxiaoguang authored May 18, 2022
    Configuration menu
    Copy the full SHA
    c810cc9 View commit details
    Browse the repository at this point in the history

  2. UI part for auto merge

    @wxiaoguang
    wxiaoguang committed May 18, 2022
    Configuration menu
    Copy the full SHA
    1c11584 View commit details
    Browse the repository at this point in the history

  3. disable unnecessary eslint

    @wxiaoguang
    wxiaoguang committed May 18, 2022
    Configuration menu
    Copy the full SHA
    916e4bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 18, 2022
    Configuration menu
    Copy the full SHA
    346c545 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. refactor and add comments

    @wxiaoguang
    wxiaoguang committed May 19, 2022
    Configuration menu
    Copy the full SHA
    2bc2215 View commit details
    Browse the repository at this point in the history

  2. make merge form work for writers

    @wxiaoguang
    wxiaoguang committed May 19, 2022
    Configuration menu
    Copy the full SHA
    69b2ff7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into auto-merge_webUI

    @6543
    6543 committed May 19, 2022
    Configuration menu
    Copy the full SHA
    05317de View commit details
    Browse the repository at this point in the history

  4. fine tune button colors

    @wxiaoguang
    wxiaoguang committed May 19, 2022
    Configuration menu
    Copy the full SHA
    935ab7b View commit details
    Browse the repository at this point in the history

  5. hide the auto merge if this PR can be merged now

    @wxiaoguang
    wxiaoguang committed May 19, 2022
    Configuration menu
    Copy the full SHA
    0991637 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 19, 2022
    Configuration menu
    Copy the full SHA
    5f6f1c9 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. UX: hide delete_branch_after_merge for auto-merge

    @6543
    6543 committed May 20, 2022
    Configuration menu
    Copy the full SHA
    a078ba8 View commit details
    Browse the repository at this point in the history

  2. UX: dont hide auto-merge schedule for admins

    @6543
    6543 committed May 20, 2022
    Configuration menu
    Copy the full SHA
    53a8b04 View commit details
    Browse the repository at this point in the history

  3. UX: make scheduled auto-merges be overwritten from webUI

    @6543
    6543 committed May 20, 2022
    Configuration menu
    Copy the full SHA
    3e204ee View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    4880009 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into auto-merge_webUI

    @wxiaoguang
    wxiaoguang authored May 20, 2022
    Configuration menu
    Copy the full SHA
    40f7796 View commit details
    Browse the repository at this point in the history

  6. add comment for testing

    @wxiaoguang
    wxiaoguang committed May 20, 2022
    Configuration menu
    Copy the full SHA
    3fdc599 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    8dfe1eb View commit details
    Browse the repository at this point in the history

  8. add comment for testing

    @wxiaoguang
    wxiaoguang committed May 20, 2022
    Configuration menu
    Copy the full SHA
    c614ffa View commit details
    Browse the repository at this point in the history

  9. fine tune css style

    @wxiaoguang
    wxiaoguang committed May 20, 2022
    Configuration menu
    Copy the full SHA
    837add8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    6dfe7d6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    d9c36da View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    ccd50c6 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 20, 2022
    Configuration menu
    Copy the full SHA
    fd93997 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 21, 2022
    Configuration menu
    Copy the full SHA
    402b6a0 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 23, 2022
    Configuration menu
    Copy the full SHA
    ba0173a View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored May 24, 2022
    Configuration menu
    Copy the full SHA
    78e1174 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    6bef922 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 3, 2022
    Configuration menu
    Copy the full SHA
    6305f52 View commit details
    Browse the repository at this point in the history

  2. Update templates/repo/issue/view_content/pull.tmpl 

    Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
    @wxiaoguang @lunny
    wxiaoguang and lunny authored Jun 3, 2022
    Configuration menu
    Copy the full SHA
    8edb5c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 5, 2022
    Configuration menu
    Copy the full SHA
    eb33a2f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @wxiaoguang
    wxiaoguang authored Jun 9, 2022
    Configuration menu
    Copy the full SHA
    0502a21 View commit details
    Browse the repository at this point in the history

  2. UI adjuestment

    @wxiaoguang
    wxiaoguang committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    9bd5f97 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 10, 2022
    Configuration menu
    Copy the full SHA
    6303b2b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 10, 2022
    Configuration menu
    Copy the full SHA
    0e2f19d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2022

  1. Update web_src/js/components/PullRequestMergeForm.vue 

    Co-authored-by: delvh <dev.lh@web.de>
    @wxiaoguang @delvh
    wxiaoguang and delvh authored Jun 11, 2022
    Configuration menu
    Copy the full SHA
    81af3ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into auto-merge_webUI

    @6543
    6543 authored Jun 11, 2022
    Configuration menu
    Copy the full SHA
    5dd9e56 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into auto-merge_webUI

    @lunny
    lunny authored Jun 11, 2022
    Configuration menu
    Copy the full SHA
    4f12809 View commit details
    Browse the repository at this point in the history