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

[BUGFIX release] Cleanup test only dependencies. #5223

Merged
merged 1 commit into from
Oct 12, 2017

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Oct 12, 2017

Removes some test only dependencies.

Fixes #5222

@rwjblue
Copy link
Member Author

rwjblue commented Oct 12, 2017

The failure in Travis was the one being fixed in #5224

@rwjblue
Copy link
Member Author

rwjblue commented Oct 12, 2017

Rebased on top of #5224.

@rwjblue rwjblue force-pushed the dependency-cleanup branch 2 times, most recently from 04cfeec to 7aa6943 Compare October 12, 2017 03:26
@Turbo87
Copy link
Member

Turbo87 commented Oct 12, 2017

@rwjblue looks like CI is still falling with a broccoli error 🤔

since both commits target different branches should we split the PR up?

@rwjblue rwjblue changed the title [BUGFIX] Cleanup dependencies. [BUGFIX release] Cleanup test only dependencies. Oct 12, 2017
Also fixed small issue (which was being squelched by bugs in deps that
have been updated here) with a merge (needed to allow overwriting).
@rwjblue
Copy link
Member Author

rwjblue commented Oct 12, 2017

Ya, good point (will help us land this quicker). I pared this one down to just the test dependency changes.

@rwjblue rwjblue merged commit c11028f into emberjs:master Oct 12, 2017
@rwjblue rwjblue deleted the dependency-cleanup branch October 12, 2017 14:50
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