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

Avoid errors when ember-cli-shims is not included. #4200

Merged
merged 1 commit into from
Mar 5, 2016
Merged

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Mar 2, 2016

Closes #4192.

@bmac
Copy link
Member

bmac commented Mar 5, 2016

Restarted travis. Looked like the original issue was unrelated to this code change.

@rwjblue
Copy link
Member Author

rwjblue commented Mar 5, 2016

Ya, but soon we will not be using ember-cli-shims at all (once ember addon follows ember-data's lead and ships its own public modules) so it makes sense to ensure that we don't error when it isn't present...

@bmac
Copy link
Member

bmac commented Mar 5, 2016

Agreed. I see now my comment was ambiguous. I intended to suggest the reason that travis failed appeared unrelated to this code change.

bmac added a commit that referenced this pull request Mar 5, 2016
Avoid errors when ember-cli-shims is not included.
@bmac bmac merged commit b329be6 into master Mar 5, 2016
@rwjblue
Copy link
Member Author

rwjblue commented Mar 5, 2016

Ahh! I see, sorry about the confusion/noise :)

@bmac bmac deleted the rwjblue-patch-1 branch March 5, 2016 16:03
Turbo87 added a commit to Turbo87/active-model-adapter that referenced this pull request Oct 25, 2017
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