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

Branches not at ref commit ID should not be listed as Merged #9614

Merged
merged 16 commits into from
Jan 7, 2020
Merged

Branches not at ref commit ID should not be listed as Merged #9614

merged 16 commits into from
Jan 7, 2020

Commits on Jan 5, 2020

  1. Don't list as merged branches not at mergecommitid 

    Once a branch has been merged if the commit ID no longer equals that of
the merge commit id don't offer to delete the branch on the pull screen
and don't list it as merged on branches.

Fix go-gitea#9201
    @zeripath
    zeripath committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    93364b9 View commit details
    Browse the repository at this point in the history

  2. Need to use the refs/pull/x/head

    @zeripath
    zeripath committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    4af6395 View commit details
    Browse the repository at this point in the history

  3. Slight efficiency improvement

    @zeripath
    zeripath committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    84decfe View commit details
    Browse the repository at this point in the history

  4. Update routers/repo/branch.go

    @zeripath
    zeripath authored Jan 5, 2020
    Configuration menu
    Copy the full SHA
    3db7335 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Slight efficiency improvement

    @zeripath
    zeripath committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    6f8d95e View commit details
    Browse the repository at this point in the history

  2. Also fix go-gitea#9158

    @zeripath
    zeripath committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    ba13b0f View commit details
    Browse the repository at this point in the history

  3. Further slight efficiency improvement

    @zeripath
    zeripath committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    a9d65b8 View commit details
    Browse the repository at this point in the history

  4. Add refs/pull/3/head to fix the integration test

    @zeripath
    zeripath committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    4c40b8e View commit details
    Browse the repository at this point in the history

  5. Alternative head to push

    @zeripath
    zeripath committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    d3a5b4b View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Update routers/repo/branch.go 

    Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
    @zeripath @guillep2k
    zeripath and guillep2k authored Jan 7, 2020
    Configuration menu
    Copy the full SHA
    6ebbe30 View commit details
    Browse the repository at this point in the history

  2. Allow HeadRepo to be nil

    @zeripath
    zeripath committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    705420a View commit details
    Browse the repository at this point in the history

  3. More efficiency - in branch view we know that all of these PRs have t… 

    …he same head repo
    @zeripath
    zeripath committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    d6d2f87 View commit details
    Browse the repository at this point in the history

  4. Further improvement - we already have the head commit - so use it

    @zeripath
    zeripath committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    cf502ac View commit details
    Browse the repository at this point in the history

  5. Fix nil pointer dereference

    @zeripath
    zeripath committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    d76f586 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into fix-9201

    @zeripath
    zeripath authored Jan 7, 2020
    Configuration menu
    Copy the full SHA
    13175c0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into fix-9201

    @zeripath
    zeripath authored Jan 7, 2020
    Configuration menu
    Copy the full SHA
    c440e52 View commit details
    Browse the repository at this point in the history