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

feat: deep merge resolvers #11760

Merged
merged 21 commits into from
Apr 15, 2024
Merged

feat: deep merge resolvers #11760

merged 21 commits into from
Apr 15, 2024

Commits on Apr 5, 2024

  1. feat: deep merge resolvers by default

    @alessbell
    alessbell committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    5d6a069 View commit details
    Browse the repository at this point in the history

  2. chore: add changeset

    @alessbell
    alessbell committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    912220a View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. chore: update comment

    @alessbell
    alessbell committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    12a5f36 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. chore: add reset test, remove option

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    0fb94cc View commit details
    Browse the repository at this point in the history

  2. chore: update changeset

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    696a15d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-3.10' into issue-11758-merging-resolvers

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    49d9557 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release-3.10' of github.com:apollographql/apollo-client… 

    … into issue-11758-merging-resolvers
    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    cd40f9c View commit details
    Browse the repository at this point in the history

  5. chore: update changeset

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c10dd8b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'release-3.10' into issue-11758-merging-resolvers

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    52afa27 View commit details
    Browse the repository at this point in the history

  7. fix: update function names in tests

    @alessbell
    alessbell committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    ce4f9cd View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. fix: remove unused useTrackRenders

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    178eb83 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-3.10' of github.com:apollographql/apollo-client… 

    … into issue-11758-merging-resolvers
    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b6bf236 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-3.10' into issue-11758-merging-resolvers

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f51a233 View commit details
    Browse the repository at this point in the history

  4. chore: fix tests post-merge and merge resolvers in .fork

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    25872f6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release-3.10' into issue-11758-merging-resolvers

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b36407b View commit details
    Browse the repository at this point in the history

  6. chore: comment out flaky test

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b95cad4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'issue-11758-merging-resolvers' of github.com:apollograp… 

    …hql/apollo-client into issue-11758-merging-resolvers
    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    07a568a View commit details
    Browse the repository at this point in the history

  8. chore: update comment with link to issue

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    712d338 View commit details
    Browse the repository at this point in the history

  9. commit failing test

    @alessbell
    alessbell committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0d49273 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. chore: fix merge conflicts

    @alessbell
    alessbell committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    0130771 View commit details
    Browse the repository at this point in the history

  2. chore: remove old comment

    @alessbell
    alessbell committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    c6eaea4 View commit details
    Browse the repository at this point in the history