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: don't diff custom resolvers #5533

Merged
merged 2 commits into from Mar 20, 2020
Merged

Fix: don't diff custom resolvers #5533

merged 2 commits into from Mar 20, 2020

Conversation

JelmerV-WFC
Copy link
Contributor

@JelmerV-WFC JelmerV-WFC commented Mar 18, 2020 •
edited by derrickmehaffy

Description of what you did:

When checking for diff in resolvers leave custom resolvers alone

@JelmerV-WFC
Leave custom resolvers alone when diff
b2187cf 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
@JelmerV-WFC
Return newObj instead of original object
4c1f3c8 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
@JelmerV-WFC JelmerV-WFC force-pushed the fix/dont-diff-custom-resolvers branch from a07c3ba to 4c1f3c8 Compare March 18, 2020 10:59
alexandrebodin
alexandrebodin approved these changes Mar 18, 2020
View reviewed changes
Copy link
Member

@alexandrebodin alexandrebodin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@alexandrebodin alexandrebodin added issue: enhancement Issue suggesting an enhancement to an existing feature and removed issue: enhancement Issue suggesting an enhancement to an existing feature labels Mar 18, 2020
@alexandrebodin
Copy link
Member

Just need to verify by hand certain usecase before merging :)

@alexandrebodin alexandrebodin added source: plugin:graphql Source is plugin/graphql package issue: enhancement Issue suggesting an enhancement to an existing feature labels Mar 18, 2020
@alexandrebodin alexandrebodin added this to the 3.0.0-beta.19.4 milestone Mar 18, 2020
@JelmerV-WFC JelmerV-WFC changed the title Fix/dont diff custom resolvers Fix: don't diff custom resolvers Mar 18, 2020
@strapi strapi deleted a comment from codecov bot Mar 20, 2020
@alexandrebodin alexandrebodin merged commit 7f3be5e into strapi:master Mar 20, 2020
@JelmerV-WFC JelmerV-WFC deleted the fix/dont-diff-custom-resolvers branch March 23, 2020 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandrebodin alexandrebodin alexandrebodin approved these changes

Assignees
No one assigned
Labels
issue: enhancement Issue suggesting an enhancement to an existing feature source: plugin:graphql Source is plugin/graphql package
Projects
None yet
Milestone
3.0.0-beta.19.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@JelmerV-WFC @alexandrebodin