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

beta backports #7003

Merged
merged 6 commits into from
Jan 24, 2020
Merged

beta backports #7003

merged 6 commits into from
Jan 24, 2020

Conversation

hjdivad
Copy link
Member

@hjdivad hjdivad commented Jan 24, 2020

backports to 3.16.x-beta.x

backport #6960 #6969 #6985

igorT and others added 5 commits January 23, 2020 19:57
Dividing Record Data into packages (#6513) configured the Store class
inside of the `-ember-data` metapackage. This broke importing the Store directly from `@ember-data/store`,
which this commit fixes.

(cherry picked from commit 3e3677f)
(cherry picked from commit 98f41fd)
ignore other dist output dirs too

(cherry picked from commit 2a1c1e9)
Co-Authored-By: David J. Hamilton <dhamilton@linkedin.com>
(cherry picked from commit f95c2ba)
@hjdivad hjdivad changed the title Hjdivad/beta backports beta backports Jan 24, 2020
Test is automatically re-enabled for 3.17.x.  We can re-enable it once
the upstream failure (glimmerjs/glimmer-vm#1010) is resolved and into
ember-source.

(cherry picked from commit 10ad35f)
@hjdivad hjdivad added the backport-beta PR targets the beta branch label Jan 24, 2020
@runspired runspired merged commit d829559 into beta Jan 24, 2020
@delete-merged-branch delete-merged-branch bot deleted the hjdivad/beta-backports branch January 24, 2020 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-beta PR targets the beta branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants