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.

Sign up for GitHub

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

Jump to bottom

Add Ember.RouterDSL.resource support #27

Merged
merged 3 commits into from
Dec 13, 2017
Merged

Add Ember.RouterDSL.resource support #27

merged 3 commits into from
Dec 13, 2017

Conversation

thoov
Copy link
Member

@thoov thoov commented Dec 12, 2017

Related: ember.js PR

Closes: #2

@thoov
Copy link
Member Author

thoov commented Dec 12, 2017

@locks @rwjblue can you both take a look at this

thoov
thoov commented Dec 12, 2017
View reviewed changes
tests/unit/router-resource-test.js
let router = Router.create();
router._initRouterJs();

if (router._routerMicrolib) {
Copy link
Member Author

Choose a reason for hiding this comment

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

(╯°o°）╯︵ ┻━┻

To make ember-try 2.12 happy...

rwjblue
rwjblue approved these changes Dec 13, 2017
View reviewed changes
Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

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

LGTM, needs a rebase now I think...

@thoov thoov merged commit d8a20cd into emberjs:master Dec 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rwjblue rwjblue rwjblue approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thoov @rwjblue