diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-23 00:34:36 +0900 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-23 00:34:36 +0900 |
| commit | 07635a74b5ee08dcba3f6617def6230d8f114fe5 (patch) | |
| tree | 069f6d75b62990401239120f2916d44fc8db6b6a /actionview/lib | |
| parent | 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9 (diff) | |
| parent | 428722ba4fafe1ed9ede64afb4478750637aa410 (diff) | |
| download | rails-07635a74b5ee08dcba3f6617def6230d8f114fe5.tar.gz rails-07635a74b5ee08dcba3f6617def6230d8f114fe5.tar.bz2 rails-07635a74b5ee08dcba3f6617def6230d8f114fe5.zip | |
Merge pull request #16888 from jejacks0n/render_template
Changes default render behavior from file to template.
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 81d5836a8c..5cbdfdf6c0 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 :file => "foo/bar". + # render "foo/bar" to render :template => "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?(?/) ? :file : :action + key = action.include?(?/) ? :template : :action options[key] = action else options[:partial] = action |