Skip to content

Commit 585cfea

Browse files
weggesserseanpdoyle
authored andcommitted
Patch for newer Rails versions not supporting text option for render
Calling `render text: ...` has been deprecated in `[email protected]`. This commit [replaces `text:` with `html:`][docs]. [docs]: http://guides.rubyonrails.org/layouts_and_rendering.html#rendering-html
1 parent bd18720 commit 585cfea

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
master
22
------
33

4-
* Use `Mime::Type.html?`
4+
* Call `render` with `html:` instead of `text:`. [#519]
5+
* Use `Mime::Type.html?` [#523]
56

7+
[#519]: https://github.com/thoughtbot/ember-cli-rails/pull/519
68
[#523]: https://github.com/thoughtbot/ember-cli-rails/pull/523
79

810
0.8.4

app/helpers/ember_rails_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ def render_ember_app(name, &block)
88

99
head, body = markup_capturer.capture
1010

11-
render text: EmberCli[name].index_html(head: head, body: body).html_safe
11+
render html: EmberCli[name].index_html(head: head, body: body).html_safe
1212
end
1313
end

0 commit comments

Comments
 (0)