aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
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 /railties/lib/rails/application.rb
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 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index ae3993fbd8..bf3a26d400 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -123,6 +123,7 @@ module Rails
# Currently stores:
#
# * "action_dispatch.parameter_filter" => config.filter_parameters
+ # * "action_dispatch.redirect_filter" => config.filter_redirect
# * "action_dispatch.secret_token" => config.secret_token,
# * "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
# * "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local
@@ -149,6 +150,7 @@ module Rails
super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters,
+ "action_dispatch.redirect_filter" => config.filter_redirect,
"action_dispatch.secret_token" => config.secret_token,
"action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
"action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,