diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-28 09:23:51 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-28 09:23:51 -0300 |
commit | 172e452e0a0147701d08b85573fbabe22f2d9274 (patch) | |
tree | df1d43df102bb584ac8a10891cb546862516b403 /actionview | |
parent | 207f8fc7debec1e9173f797e5208527e97235af3 (diff) | |
parent | 44781b6e9790d90b4f8b9a41d2b2c114b1a582ee (diff) | |
download | rails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.gz rails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.bz2 rails-172e452e0a0147701d08b85573fbabe22f2d9274.zip |
Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_method
Deprecate `:nothing` option for render method
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/test/actionpack/controller/render_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index 7cbc77f11f..d69c070ede 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -358,7 +358,7 @@ class TestController < ApplicationController end def rendering_nothing_on_layout - render :nothing => true + head :ok end def render_to_string_with_assigns |