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

Add checkbox to delete pull branch after successful merge #16049

Merged
merged 18 commits into from
Jul 12, 2021
Merged

Add checkbox to delete pull branch after successful merge #16049

merged 18 commits into from
Jul 12, 2021

Commits on Jun 2, 2021

  1. Add checkbox to delete pull branch after successful merge

    @jpraet
    jpraet committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    753a50b View commit details
    Browse the repository at this point in the history

  2. Omit DeleteBranchAfterMerge field in json

    @jpraet
    jpraet committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    a9cab40 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Log a warning instead of error when PR head branch deleted

    @jpraet
    jpraet committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    2a9062b View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Add DefaultDeleteBranchAfterMerge to PullRequestConfig

    @jpraet
    jpraet committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    996ee46 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. Merge branch 'main' into delete-pull-branch-on-merge

    @jpraet
    jpraet authored Jun 5, 2021
    Configuration menu
    Copy the full SHA
    8f8465c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Merge branch 'main' into delete-pull-branch-on-merge

    @jpraet
    jpraet authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    bff67a1 View commit details
    Browse the repository at this point in the history

  2. Add support for delete_branch_after_merge via API

    @jpraet
    jpraet committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    8a2b5c8 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2021

  1. Merge branch 'master' into delete-pull-branch-on-merge

    @jpraet
    jpraet committed Jun 19, 2021
    Configuration menu
    Copy the full SHA
    87b9658 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Merge branch 'main' into delete-pull-branch-on-merge

    @jpraet
    jpraet authored Jun 24, 2021
    Configuration menu
    Copy the full SHA
    e8dd420 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Merge branch 'master' into delete-pull-branch-on-merge

    @jpraet
    jpraet committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    afde69c View commit details
    Browse the repository at this point in the history

  2. Fix for API: the branch should be deleted from the HEAD repo 

    If head and base repo are the same, reuse the already opened ctx.Repo.GitRepo
    @jpraet
    jpraet committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    f9e238b View commit details
    Browse the repository at this point in the history

  3. Don't delegate to CleanupBranch, only reuse branch deletion code 

    CleanupBranch contains too much logic that has already been performed by the Merge
    @jpraet
    jpraet committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    f55f607 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. reuse gitrepo in MergePullRequest 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    a2a3780 View commit details
    Browse the repository at this point in the history

  2. more reuse 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    86a2a29 View commit details
    Browse the repository at this point in the history

  3. really check 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    96e160d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into delete-pull-branch-on-merge

    @6543
    6543 authored Jul 5, 2021
    Configuration menu
    Copy the full SHA
    2bd49cf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into delete-pull-branch-on-merge

    @6543
    6543 authored Jul 5, 2021
    Configuration menu
    Copy the full SHA
    1bd2bff View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Merge branch 'main' into delete-pull-branch-on-merge

    @6543
    6543 authored Jul 12, 2021
    Configuration menu
    Copy the full SHA
    84cf6b4 View commit details
    Browse the repository at this point in the history