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

Use Vue to refactor pull merge UI #19650

Merged
merged 16 commits into from
May 12, 2022
Merged

Use Vue to refactor pull merge UI #19650

merged 16 commits into from
May 12, 2022

Commits on May 7, 2022

  1. Use Vue to refactor pull merge UI

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

  2. Merge branch 'main' into refactor-pull-merge-ui

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

  3. add comments

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

  4. fix comments

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

  5. small fine tune

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

Commits on May 8, 2022

  1. fix tests

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

  2. Merge branch 'main' into refactor-pull-merge-ui 

    # Conflicts:
#	templates/repo/issue/view_content/pull.tmpl
    @wxiaoguang
    wxiaoguang committed May 8, 2022
    Configuration menu
    Copy the full SHA
    4c89a10 View commit details
    Browse the repository at this point in the history

  3. adopt new pull default messages

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

  4. Merge branch 'main' into refactor-pull-merge-ui

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

  5. clean up

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

  6. Merge branch 'main' into refactor-pull-merge-ui

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

  7. Merge branch 'main' into refactor-pull-merge-ui

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

  8. Merge branch 'master' into refactor-pull-merge-ui

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

Commits on May 9, 2022

  1. Merge branch 'main' into refactor-pull-merge-ui

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

  2. Merge branch 'main' into refactor-pull-merge-ui

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

Commits on May 12, 2022

  1. Merge branch 'main' into refactor-pull-merge-ui

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