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 "Update Branch" button to Pull Requests #9784

Merged
merged 39 commits into from
Jan 17, 2020
Merged

Add "Update Branch" button to Pull Requests #9784

merged 39 commits into from
Jan 17, 2020

Commits on Jan 16, 2020

  1. add Divergence

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    38a27df View commit details
    Browse the repository at this point in the history

  2. add Update Button

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    2c7fc31 View commit details
    Browse the repository at this point in the history

  3. first working version

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    26d686f View commit details
    Browse the repository at this point in the history

  4. re-use code

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    d8522ac View commit details
    Browse the repository at this point in the history

  5. split raw merge commands and db-change functions (notify, cache, ...)

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    efe6982 View commit details
    Browse the repository at this point in the history

  6. use rawMerge (remove redundant code)

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    328ecc3 View commit details
    Browse the repository at this point in the history

  7. own function to get Diverging of PRs

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    9249d47 View commit details
    Browse the repository at this point in the history

  8. use FlashError

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    454ee44 View commit details
    Browse the repository at this point in the history

  9. correct Error Msg

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    5d5d919 View commit details
    Browse the repository at this point in the history

  10. hook is triggerd ... so remove comment

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    3c6157b View commit details
    Browse the repository at this point in the history

  11. add "branch2" to "user2/repo1" because it unit-test "TestPullView_Rev… 

    …iewerMissed" use it but dont exist jet :/
    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    88fa4c5 View commit details
    Browse the repository at this point in the history

  12. move GetPerm to IsUserAllowedToUpdate

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    7776738 View commit details
    Browse the repository at this point in the history

  13. add Flash Success MSG

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    e3adbd2 View commit details
    Browse the repository at this point in the history

  14. imprufe code 

    - remove useless js chage
    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    05c0c1b View commit details
    Browse the repository at this point in the history

  15. fix-lint

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    f7d924a View commit details
    Browse the repository at this point in the history

  16. TEST: add PullRequest ID:5 

    Repo: user2/repo1
Base: branch1
Head: pr-to-update
    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    e2f96d9 View commit details
    Browse the repository at this point in the history

  17. correct comments

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    8bad5d2 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into update-pr

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    7442991 View commit details
    Browse the repository at this point in the history

  19. make PR5 outdated

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    143d8e8 View commit details
    Browse the repository at this point in the history

  20. fix Tests

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    fb33b4b View commit details
    Browse the repository at this point in the history

  21. WIP: add pull update test

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    069a393 View commit details
    Browse the repository at this point in the history

  22. update revs

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    720fbf1 View commit details
    Browse the repository at this point in the history

  23. update locales

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    892ddd9 View commit details
    Browse the repository at this point in the history

  24. working TEST

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

  25. Merge branch 'master' into update-pr

    @6543
    6543 authored Jan 16, 2020
    Configuration menu
    Copy the full SHA
    7502ff5 View commit details
    Browse the repository at this point in the history

  26. update UI

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    36a34cd View commit details
    Browse the repository at this point in the history

  27. misspell

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    18fadef View commit details
    Browse the repository at this point in the history

  28. change style

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    97e51ec View commit details
    Browse the repository at this point in the history

  29. add 1s delay so rev exist

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    18eb495 View commit details
    Browse the repository at this point in the history

  30. move row up (before merge row)

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    2b58961 View commit details
    Browse the repository at this point in the history

  31. fix lint nit

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    688a53a View commit details
    Browse the repository at this point in the history

  32. UI remove divider

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    97a6f83 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' into update-pr

    @6543
    6543 committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    32c5eee View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. Update style

    @lafriks @6543
    lafriks authored and 6543 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    6400bcc View commit details
    Browse the repository at this point in the history

  2. nits

    @6543
    6543 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    fa4779b View commit details
    Browse the repository at this point in the history

  3. do it right

    @6543
    6543 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    fbbc7f4 View commit details
    Browse the repository at this point in the history

  4. introduce IsSameRepo

    @6543
    6543 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    717406e View commit details
    Browse the repository at this point in the history

  5. remove useless check

    @6543
    6543 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    f26c8b3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into update-pr

    @6543
    6543 authored Jan 17, 2020
    Configuration menu
    Copy the full SHA
    246748f View commit details
    Browse the repository at this point in the history