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 beta] Removes this._environment guard #14079

Merged
merged 1 commit into from Sep 2, 2016

Conversation

duggiefresh
Copy link
Contributor

Fixes #14029

@duggiefresh
Copy link
Contributor Author

Let me know if there's something I missed in order to close #14029. Thanks!

@krisselden
Copy link
Contributor

@duggiefresh it is missing a regression test, but I think this maybe related to: #14085

@@ -1232,7 +1232,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {

this.setupController(controller, context, transition);

if (!this._environment || this._environment.options.shouldRender) {
if (this._environment.options.shouldRender) {
Copy link
Member

Choose a reason for hiding this comment

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

woooooo

@mixonic
Copy link
Sponsor Member

mixonic commented Aug 21, 2016

@chancancode seemed to suggest this was good to roll if no tests failed when it was removed 8e317ee#commitcomment-18526477 @krisselden I think you're correct, are you asking for a regression test to be added here though? I wasn't sure reading your comment.

@krisselden
Copy link
Contributor

Yes, bug fixes require test to ensure they don't regress

@duggiefresh duggiefresh force-pushed the 14029-remove-environment-guard branch from 6e136c2 to 282f844 Compare August 25, 2016 18:48
@duggiefresh
Copy link
Contributor Author

Thanks for clarifying @mixonic and @krisselden. I've added a test and included renderers into engine-instance, as seen in #14085. Let me know if this is the right direction. Thanks!

@homu
Copy link
Contributor

homu commented Aug 27, 2016

☔ The latest upstream changes (presumably #14135) made this pull request unmergeable. Please resolve the merge conflicts.

@krisselden
Copy link
Contributor

looks good, thank you, needs a rebase though.

@duggiefresh duggiefresh force-pushed the 14029-remove-environment-guard branch from 282f844 to aadb2e0 Compare August 29, 2016 04:48
@duggiefresh
Copy link
Contributor Author

Rebased! 🍨

@rwjblue rwjblue merged commit 63d9c84 into emberjs:master Sep 2, 2016
@rwjblue
Copy link
Member

rwjblue commented Sep 2, 2016

Thanks @duggiefresh!

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.

None yet

6 participants