diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-15 16:18:05 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-15 16:18:37 -0300 |
commit | 16a8a68b7eb71e57fc457750758d2dc8e978584b (patch) | |
tree | 11a3b749a0889e3d2a38e919d70a1143c119fe77 /actionpack/lib/action_controller/metal/rack_delegation.rb | |
parent | cf50bbd68c6ceb5a1ac095c5407b79cfc7214788 (diff) | |
parent | 20fece149185d7eed03d464b1bbc8a7636bb4f98 (diff) | |
download | rails-16a8a68b7eb71e57fc457750758d2dc8e978584b.tar.gz rails-16a8a68b7eb71e57fc457750758d2dc8e978584b.tar.bz2 rails-16a8a68b7eb71e57fc457750758d2dc8e978584b.zip |
Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep
fixes stack level too deep exception on action named 'status' rendering 'head :ok'
Diffstat (limited to 'actionpack/lib/action_controller/metal/rack_delegation.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index bdf6e88699..6921834044 100644 --- a/actionpack/lib/action_controller/metal/rack_delegation.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -6,7 +6,7 @@ module ActionController extend ActiveSupport::Concern delegate :headers, :status=, :location=, :content_type=, - :status, :location, :content_type, :to => "@_response" + :status, :location, :content_type, :_status_code, :to => "@_response" def dispatch(action, request) set_response!(request) |