aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:45:23 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-26 10:51:13 -0700
commita50d55a7eee89dbbcf831c3717d9837462f7a70f (patch)
tree2e636db941df6dfea121a6a2a67f49af3e17cf9b /actionpack/lib
parent27daea82d77a81a866ca20f547ab66e0f47d6380 (diff)
downloadrails-a50d55a7eee89dbbcf831c3717d9837462f7a70f.tar.gz
rails-a50d55a7eee89dbbcf831c3717d9837462f7a70f.tar.bz2
rails-a50d55a7eee89dbbcf831c3717d9837462f7a70f.zip
remove ivars from the "protected" list
these ivars don't exist anymore, so we can remove them from the list
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 55734b9774..105f69884d 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -252,7 +252,7 @@ module ActionController
# Define some internal variables that should not be propagated to the view.
PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [
- :@_status, :@_headers, :@_params, :@_response, :@_request,
+ :@_params, :@_response, :@_request,
:@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout ]
def _protected_ivars # :nodoc: