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

Only check for conflicts/merging if the PR has not been merged in the interim #10132

Merged
merged 37 commits into from
Feb 9, 2020
Merged

Only check for conflicts/merging if the PR has not been merged in the interim #10132

merged 37 commits into from
Feb 9, 2020

Commits on Feb 3, 2020

  1. Only check for merging if the PR has not been merged in the interim

    @zeripath
    zeripath committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    ef1a8a5 View commit details
    Browse the repository at this point in the history

  2. fixup! Only check for merging if the PR has not been merged in the in… 

    …terim
    @zeripath
    zeripath committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    e29a6de View commit details
    Browse the repository at this point in the history

  3. Try to fix test failure

    @zeripath
    zeripath committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    1205165 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

  1. Use PR2 not PR1 in tests as PR1 merges automatically

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

  2. Merge branch 'master' into improve-pr-check

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

  3. return already merged error

    @zeripath
    zeripath committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    9a90443 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Merge branch 'master' into improve-pr-check

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

Commits on Feb 6, 2020

  1. enforce locking

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

  2. enforce locking - fix-test

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

  3. enforce locking - fix-testx2

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

  4. enforce locking - fix-testx3

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

Commits on Feb 9, 2020

  1. move pullrequest checking to after merge 

    This might improve the chance that the race does not affect us but does not prevent it.
    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    76f7eef View commit details
    Browse the repository at this point in the history

  2. Remove minor race with getting merge commit id

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    a60c5b8 View commit details
    Browse the repository at this point in the history

  3. fixup

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    87f5793 View commit details
    Browse the repository at this point in the history

  4. move check pr after merge

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    f8f886f View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary prepareTestEnv - onGiteaRun does this for us

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    389342c View commit details
    Browse the repository at this point in the history

  6. Add information about when merging occuring

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    203ff71 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into improve-pr-check

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    bd6badc View commit details
    Browse the repository at this point in the history

  8. fix fmt

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    ab79a00 View commit details
    Browse the repository at this point in the history

  9. More logging

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    9c79c73 View commit details
    Browse the repository at this point in the history

  10. Attempt to fix mysql

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    36c3771 View commit details
    Browse the repository at this point in the history

  11. Try MySQL fix again

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    3a9768f View commit details
    Browse the repository at this point in the history

  12. try again

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    f055a73 View commit details
    Browse the repository at this point in the history

  13. Try again?!

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    ca9103d View commit details
    Browse the repository at this point in the history

  14. Try again?!

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    22631c2 View commit details
    Browse the repository at this point in the history

  15. Sigh

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    fa8f010 View commit details
    Browse the repository at this point in the history

  16. remove the count - perhaps that will help

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    441ff1a View commit details
    Browse the repository at this point in the history

  17. next remove the update id

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    52cd67c View commit details
    Browse the repository at this point in the history

  18. next remove the update id - make it updated_unix instead

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    8373df4 View commit details
    Browse the repository at this point in the history

  19. On failure to merge ensure that the pr is rechecked for conflict errors

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    c8c5809 View commit details
    Browse the repository at this point in the history

  20. On failure to merge ensure that the pr is rechecked for conflict errors

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    f505332 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into improve-pr-check

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    0140315 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into improve-pr-check

    @lafriks
    lafriks committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    bd7c2eb View commit details
    Browse the repository at this point in the history

  23. Update models/pull.go

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    7486e16 View commit details
    Browse the repository at this point in the history

  24. Update models/pull.go 

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

  25. Apply suggestions from code review 

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

  26. Merge branch 'master' into improve-pr-check

    @zeripath
    zeripath committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    1ffd6bc View commit details
    Browse the repository at this point in the history