diff options
| author | प्रथमेश Sonpatki <csonpatki@gmail.com> | 2017-01-12 20:31:16 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-12 20:31:16 +0530 |
| commit | 242d7e1e039dd36e9868f13824cb6770a9d01076 (patch) | |
| tree | c8738f1cf8965f6aab3c1c54d8ab20346e5ba5de /actionpack/lib | |
| parent | 9ae511f55047b2380224ad993a7d0ed97dbcf944 (diff) | |
| parent | 67471a28f5e68fc6057b705c4bdce27d7edb1a78 (diff) | |
| download | rails-242d7e1e039dd36e9868f13824cb6770a9d01076.tar.gz rails-242d7e1e039dd36e9868f13824cb6770a9d01076.tar.bz2 rails-242d7e1e039dd36e9868f13824cb6770a9d01076.zip | |
Merge pull request #27656 from y-yagi/fix_method_name_in_renderer_doc
fix method name in `Renderer` doc [ci skip]
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index 3ff80e6a39..acb400cd15 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -60,7 +60,8 @@ module ActionController end # Accepts a custom Rack environment to render templates in. - # It will be merged with ActionController::Renderer.defaults + # It will be merged with the default Rack environment defined by + # +ActionController::Renderer::DEFAULTS+. def initialize(controller, env, defaults) @controller = controller @defaults = defaults |