Reverse merge master -> dev #29
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Michannne patch 1 (#15) * Add travis config file * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Micah/try fix asm generation (#25) * Michannne patch 1 (#15) (#17) * Add travis config file * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml * Changes to Asm Generation * Fix test * Fixed issue with enumerations not being stored as singletons * Extended test checking to check if Query resolves Used new test to fix issues with newly added types Added method to resolve unsupported value type conversions in GraphQL.NET * Polished unit tests Fixed cyclical graph type reference Added exception handling * Fix stitch issue encountered in client code * Fixing stitching functionality Added helper extensions to find base generic type Added some minor exception handling
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Michannne patch 1 (Michannne patch 1 #15)
Add travis config file
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Micah/try fix asm generation (Micah/try fix asm generation #25)
Michannne patch 1 (Michannne patch 1 #15) (Michannne patch 1 (#15) #17)
Add travis config file
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Changes to Asm Generation
Fix test
Fixed issue with enumerations not being stored as singletons
Extended test checking to check if Query resolves
Used new test to fix issues with newly added types
Added method to resolve unsupported value type conversions in GraphQL.NET
Polished unit tests
Fixed cyclical graph type reference
Added exception handling
Fix stitch issue encountered in client code
Fixing stitching functionality
Added helper extensions to find base generic type
Added some minor exception handling