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.

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

stable fix of PR #1220 #1225

Merged
merged 1 commit into from
Sep 17, 2018
Merged

Conversation

tinnou
Copy link
Contributor

@tinnou tinnou commented Sep 17, 2018

Description

Backport of #1220

Conflicts

  • GraphQLCompositeType is not GraphQLOutputType in 9.x, added appropriate check
  • Made StarWarsIntrospectionTests."Allows querying the schema for types" unit test more maintainable by using Set instead of List comparison

- GraphQLCompositeType is not GraphQLOutputType, added check
- Made StarWarsIntrospectionTests.`Allows querying the schema for types` more maintainable using Set instead of List comparison
@tinnou
Copy link
Contributor Author

tinnou commented Sep 17, 2018

Regarding https://github.com/graphql-java/graphql-java/wiki/How-to-back-port-a-fix-from-master-to-the-stable-branch last step:

label it as "stable fix"

I don't think I have permissions to add labels.

@bbakerman bbakerman merged commit 4363a82 into graphql-java:9.x Sep 17, 2018
@andimarek andimarek added this to the 9.4 milestone Oct 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants