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] backport use internalModel promise if already loading #5583

Merged
merged 1 commit into from
Aug 27, 2018
Merged

[BUGFIX] backport use internalModel promise if already loading #5583

merged 1 commit into from
Aug 27, 2018

Conversation

jrjohnson
Copy link
Contributor

Changes from #5562
Fixes #5579

This is super lazy, I couldn't get the new tests in that PR working. The testing model seems to have changed a bit between release and master. There were also changes in addon/-record-data-private/system/store.js, but I think that is new code that is only in master. If tests are required to merge this let me know and I will keep digging, but I thought maybe the fix was enough for a backport given the relatively small change.

@runspired runspired merged commit c5470c4 into emberjs:release Aug 27, 2018
@runspired
Copy link
Contributor

@jrjohnson thanks! could you backport to release-3-2 as well?

@jrjohnson
Copy link
Contributor Author

No problem, new PR to release-3-2 is #5598

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