diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-23 02:06:08 +0900 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-23 02:06:08 +0900 |
| commit | 585e75696b31395aee895e5366e331c07c3f5ee1 (patch) | |
| tree | 49ccfa225de09ea02560b1dabbf85a40cca728ab /actionview/lib | |
| parent | ca67632674e62426bf8b421d672692592e986091 (diff) | |
| download | rails-585e75696b31395aee895e5366e331c07c3f5ee1.tar.gz rails-585e75696b31395aee895e5366e331c07c3f5ee1.tar.bz2 rails-585e75696b31395aee895e5366e331c07c3f5ee1.zip | |
Revert "Merge pull request #16888 from jejacks0n/render_template"
This reverts commit 07635a74b5ee08dcba3f6617def6230d8f114fe5, reversing
changes made to 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9.
Reason: it's not ready :bomb:, see https://github.com/rails/rails/pull/16888#issuecomment-56400816
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/rendering.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index 5cbdfdf6c0..81d5836a8c 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -108,7 +108,7 @@ module ActionView end # Normalize args by converting render "foo" to render :action => "foo" and - # render "foo/bar" to render :template => "foo/bar". + # render "foo/bar" to render :file => "foo/bar". # :api: private def _normalize_args(action=nil, options={}) options = super(action, options) @@ -118,7 +118,7 @@ module ActionView options = action when String, Symbol action = action.to_s - key = action.include?(?/) ? :template : :action + key = action.include?(?/) ? :file : :action options[key] = action else options[:partial] = action |