aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/renderer.rb
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-01-12 20:52:07 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-01-12 23:34:49 +0900
commit67471a28f5e68fc6057b705c4bdce27d7edb1a78 (patch)
treec8738f1cf8965f6aab3c1c54d8ab20346e5ba5de /actionpack/lib/action_controller/renderer.rb
parent9ae511f55047b2380224ad993a7d0ed97dbcf944 (diff)
downloadrails-67471a28f5e68fc6057b705c4bdce27d7edb1a78.tar.gz
rails-67471a28f5e68fc6057b705c4bdce27d7edb1a78.tar.bz2
rails-67471a28f5e68fc6057b705c4bdce27d7edb1a78.zip
fix method name in `Renderer` doc [ci skip]
`ActionController::Renderer.defaults` was removed in 2db7304
Diffstat (limited to 'actionpack/lib/action_controller/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/renderer.rb3
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