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] Fix nested render helpers #10843

Merged
merged 2 commits into from
Apr 8, 2015
Merged

[BUGFIX release] Fix nested render helpers #10843

merged 2 commits into from
Apr 8, 2015

Conversation

awaer
Copy link

@awaer awaer commented Apr 7, 2015

Fixes #10827

This simply applies the change described by @ef4 in this comment: #10827 (comment)

@rwjblue
Copy link
Member

rwjblue commented Apr 7, 2015

Looks good to me.

@ef4 - Can you 👍 / 👎?

@ef4
Copy link
Contributor

ef4 commented Apr 7, 2015

Looks good to me.

@mmun
Copy link
Member

mmun commented Apr 7, 2015

@awaer Can you add a test similar to https://github.com/awaer/ember.js/blob/53832b348c76147b345f44ceea2e3c8e138a0a06/packages/ember/tests/routing/basic_test.js#L3744-L3769 that tests an outlet inside of nested {{render}} calls?

@awaer
Copy link
Author

awaer commented Apr 7, 2015

"This branch has failed checks, but can be merged."

I'm unfamiliar with the Travis CI feedback -- is this referring to something I need to resolve on this PR?

@rwjblue
Copy link
Member

rwjblue commented Apr 7, 2015

Phantom crashed. I just restarted that Travis build.

@rwjblue
Copy link
Member

rwjblue commented Apr 7, 2015

This commit is targeting stable branch, but we need these changes to target master. Once merged, I cherry-pick into beta and stable branches...

@rwjblue
Copy link
Member

rwjblue commented Apr 8, 2015

This is passing, so I'll just cherry-pick the other way (from stable to beta and master).

rwjblue added a commit that referenced this pull request Apr 8, 2015
[BUGFIX release] Fix nested render helpers
@rwjblue rwjblue merged commit 849fbe2 into emberjs:stable Apr 8, 2015
@awaer
Copy link
Author

awaer commented Apr 8, 2015

Sorry for the branch mixup. Thanks, @rwjblue

@rwjblue
Copy link
Member

rwjblue commented Apr 8, 2015

@awaer - No worries!

@awaer awaer deleted the fix-nested-render branch April 8, 2015 02:29
@bfcoder
Copy link

bfcoder commented Apr 14, 2015

This is still an issue in 1.11.1 http://jsbin.com/yiwama/1/edit?html,js,console,output Any chance this can be released or are there still issues with it?

@alexdiliberto
Copy link
Contributor

@bfcoder This is fixed with today's 1.11.3 release http://jsbin.com/doheto/1/edit

@bfcoder
Copy link

bfcoder commented Apr 15, 2015

@alexdiliberto I'm not seeing any release past 1.11.1 https://rubygems.org/gems/ember-source Nor in ember-cli is it past 1.11.1

@awaer
Copy link
Author

awaer commented Apr 15, 2015

@bfcoder
Copy link

bfcoder commented Apr 15, 2015

Ok, I'll just have to be patient for it to be released to the gem. :] Thanks!

@bfcoder
Copy link

bfcoder commented Apr 21, 2015

@rwjblue Any chance that 1.11.3 could be released to the ember-source gem? Or are there still issues that would prevent the release? Thanks!

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.

7 participants