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

Fix files changed and reverting merge commits from the history panel bug #1227

Merged
merged 19 commits into from
Apr 6, 2023
Merged

Fix files changed and reverting merge commits from the history panel bug #1227

merged 19 commits into from
Apr 6, 2023

Commits on Apr 3, 2023

  1. account for merge commit logs when retrieving the detailed log for a … 

    …commit, as they have an extra line for the branch that was merged into the base branch
    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    c116e9a View commit details
    Browse the repository at this point in the history

  2. add --cc option for detailed logging

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    ce38e8c View commit details
    Browse the repository at this point in the history

  3. fix reverting merge commits, assuming the mainline branch is the firs… 

    …t parent
    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    1058aee View commit details
    Browse the repository at this point in the history

  4. change test to reflect changes to detailed log

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    97d3676 View commit details
    Browse the repository at this point in the history

  5. correct detailed logger handler comment to include --cc -z

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    840a06e View commit details
    Browse the repository at this point in the history

  6. init merge commit integration test

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    fd7035d View commit details
    Browse the repository at this point in the history

  7. add @jupyterlab/galata and @playwright/test

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    1a24134 View commit details
    Browse the repository at this point in the history

  8. finish merge commit integration test 1

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    0819ed1 View commit details
    Browse the repository at this point in the history

  9. finish merge commit integration test 2

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    e14177b View commit details
    Browse the repository at this point in the history

  10. finish merge commit integration test 3

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    00c2dda View commit details
    Browse the repository at this point in the history

  11. finish merge commit integration test 4 (revert merge commit)

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    7a2685b View commit details
    Browse the repository at this point in the history

  12. fix multiple installations of @playwright/test and upgrade @playwrigh… 

    …t/test dependency
    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    1ffca83 View commit details
    Browse the repository at this point in the history

  13. complete final working ui-tests for merge commits

    @basokant @fcollonval
    basokant authored and fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    ad4412e View commit details
    Browse the repository at this point in the history

  14. Bump nodejs

    @fcollonval
    fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    568374f View commit details
    Browse the repository at this point in the history

  15. fix jest config

    @fcollonval
    fcollonval committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    2f400f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Fake crypto using node:crypto

    @fcollonval
    fcollonval committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    6045e7e View commit details
    Browse the repository at this point in the history

  2. Fix node crypto import

    @fcollonval
    fcollonval committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    8d0f10a View commit details
    Browse the repository at this point in the history

  3. Use nodejs 16 on Binder

    @fcollonval
    fcollonval authored Apr 5, 2023
    Configuration menu
    Copy the full SHA
    b70b287 View commit details
    Browse the repository at this point in the history

  4. fix selecting mergeCommit in playwright tests

    @basokant
    basokant committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    4c71ab3 View commit details
    Browse the repository at this point in the history