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

Update "blueprint-test-helpers" and "ember-cli" #4280

Merged
merged 5 commits into from
Mar 30, 2016

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Mar 28, 2016

This PR updates the "ember-cli-blueprint-test-helpers" dependency to v0.10.1 which fixes the throws assertion. This however makes another bug in [email protected] visible, which is fixed by updating to [email protected]

This should resolve some of the issues experienced in #4023

/cc @pangratz @trabus

@Turbo87
Copy link
Member Author

Turbo87 commented Mar 30, 2016

@pangratz this seems to work fine now. I'd suggest merging this PR and then rebasing #4023 on top of it.

@pangratz
Copy link
Member

@Turbo87 thanks for the heads up. Can you squash? nvm, this doesn't touch ember-data specific code, so I guess this is fine...

@pangratz pangratz merged commit 83692eb into emberjs:master Mar 30, 2016
@pangratz
Copy link
Member

Thanks for the work on this @Turbo87

@Turbo87 Turbo87 deleted the blueprint-tests branch March 30, 2016 16:16
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.

2 participants