aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-12-05 02:21:44 -0800
committerAndrew White <andyw@pixeltrix.co.uk>2012-12-05 02:21:44 -0800
commite905639af2fe947ff7e1e2331e9216032dff8b3e (patch)
tree12363a0b618b5cce5228779257036aa0c601e850 /actionpack/lib/action_controller/metal
parent4af9be089c345c58b6eae462226ca7190bc6bb73 (diff)
parent86e3aaab939a67536f007d1633ec19521dba15e9 (diff)
downloadrails-e905639af2fe947ff7e1e2331e9216032dff8b3e.tar.gz
rails-e905639af2fe947ff7e1e2331e9216032dff8b3e.tar.bz2
rails-e905639af2fe947ff7e1e2331e9216032dff8b3e.zip
Merge pull request #8404 from freegenie/filter_redirects
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index ca4ae532ca..d3aa8f90c5 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -60,7 +60,7 @@ module ActionController
ActiveSupport::Notifications.instrument("redirect_to.action_controller") do |payload|
result = super
payload[:status] = response.status
- payload[:location] = response.location
+ payload[:location] = response.filtered_location
result
end
end