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 release] In which we revert route-recognizer again. 😢 #14075

Merged
merged 1 commit into from
Aug 17, 2016

Conversation

nathanhammond
Copy link
Member

@nathanhammond nathanhammond commented Aug 16, 2016

Fixes #14073.

This will be the last revert. Working toward landing the rework in #13966.

@nathanhammond nathanhammond changed the title In which we revert route-recognizer again. 😢 [BUGFIX release] In which we revert route-recognizer again. 😢 Aug 16, 2016
@rwjblue
Copy link
Member

rwjblue commented Aug 16, 2016

Lets test out that new GitHub feature, and retarget this PR against the release branch (and update master/beta with #14077).

@nathanhammond nathanhammond reopened this Aug 17, 2016
@nathanhammond
Copy link
Member Author

@rwjblue workflow for this is approximately the same amount of effort in rebasing. I really want a "temp invisible fork" that just pulls over the differences between the original base, the PR's HEAD and applies them to the new base.

/cc @Turbo87

@rwjblue rwjblue merged commit 5c97f22 into emberjs:release Aug 17, 2016
@nathanhammond nathanhammond deleted the revert-r-r branch August 17, 2016 14:46
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