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 failing tests after PR clash #114625

Merged
merged 6 commits into from
Oct 14, 2024
Merged

Fix failing tests after PR clash #114625

merged 6 commits into from
Oct 14, 2024

Commits on Oct 11, 2024

  1. Fix failing tests after PR clash 

    To PRs conflicted without github or CI noticing. The first added these tests, and the second modified their behaviour. Both went green in CI and both were merged within an hour of each other.
    @craigtaverner
    craigtaverner committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    8d1cdb9 View commit details
    Browse the repository at this point in the history

  2. Deleted duplicate comments

    @craigtaverner
    craigtaverner committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    8e5840d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into fix_failing_tests_aft… 

    …er_pr_conflict
    @craigtaverner
    craigtaverner committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    8b7ae8c View commit details
    Browse the repository at this point in the history

  4. Unmute the tests

    @craigtaverner
    craigtaverner committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    2597254 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Also assert limit is pushed

    @alex-spies
    alex-spies committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7c14930 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into fix_failing_tests_a… 

    …fter_pr_conflict
    @alex-spies
    alex-spies committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    73676d8 View commit details
    Browse the repository at this point in the history