aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2016-05-05 17:12:25 -0500
committerArthur Nogueira Neves <github@arthurnn.com>2016-05-05 17:12:25 -0500
commit58a221278897a66bf8b9c909389da40ac2c5e534 (patch)
tree72d117720d93e0cb2ae126b9c697b040562689bd /actionpack/lib/action_controller/base.rb
parent1949412a868ccf5addc12b7569f6ebbf4b6488e4 (diff)
parent541a51ecf8ee04f956b7d8efb13935640aa831ce (diff)
downloadrails-58a221278897a66bf8b9c909389da40ac2c5e534.tar.gz
rails-58a221278897a66bf8b9c909389da40ac2c5e534.tar.bz2
rails-58a221278897a66bf8b9c909389da40ac2c5e534.zip
Merge pull request #24866 from rafaelfranca/actionview-helpers
Implement helpers proxy in controller instance level
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 56a8d2e5f4..d546d7260c 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -251,9 +251,10 @@ module ActionController
setup_renderer!
# Define some internal variables that should not be propagated to the view.
- PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [
- :@_params, :@_response, :@_request,
- :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout ]
+ PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + %i(
+ @_params @_response @_request @_config @_url_options @_action_has_layout @_view_context_class
+ @_view_renderer @_lookup_context @_routes @_view_runtime @_db_runtime @_helper_proxy
+ )
def _protected_ivars # :nodoc:
PROTECTED_IVARS