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 to ember data 1.0.0 beta.19 #99

Open
wants to merge 25 commits into
base: master
Choose a base branch
from

Conversation

joshfester
Copy link

No description provided.

igorsantos07 and others added 24 commits April 27, 2015 01:46
Conflicts:
	addon/serializers/application.js
@@ -86,7 +86,7 @@ export default DS.RESTSerializer.extend({
// the links property so the adapter can async call the
// relationship.
// The adapter findHasMany has been overridden to make use of this.
if(options.relation) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recall what was happening here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Release notes said that the typeForRoot function had been changed to modelNameFromPayloadKey

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just meant options.relationship vs options.array. I recall now, they are two different options for how to persist a relationship. One with an array of ids, one with w URL.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah my bad. See my comment below about that. Not sure what should be happening with those two options.

@joshfester
Copy link
Author

@mixonic is there anything else I can do to get this ready to be merged?

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.

3 participants