diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-05 02:21:44 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-05 02:21:44 -0800 |
| commit | e905639af2fe947ff7e1e2331e9216032dff8b3e (patch) | |
| tree | 12363a0b618b5cce5228779257036aa0c601e850 /railties | |
| parent | 4af9be089c345c58b6eae462226ca7190bc6bb73 (diff) | |
| parent | 86e3aaab939a67536f007d1633ec19521dba15e9 (diff) | |
| download | rails-e905639af2fe947ff7e1e2331e9216032dff8b3e.tar.gz rails-e905639af2fe947ff7e1e2331e9216032dff8b3e.tar.bz2 rails-e905639af2fe947ff7e1e2331e9216032dff8b3e.zip | |
Merge pull request #8404 from freegenie/filter_redirects
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
2 files changed, 4 insertions, 1 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, diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 89afeaeec5..f15fc9296d 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -13,7 +13,7 @@ module Rails :railties_order, :relative_url_root, :secret_key_base, :secret_token, :serve_static_assets, :ssl_options, :static_cache_control, :session_options, :time_zone, :reload_classes_only_on_change, - :queue, :queue_consumer, :beginning_of_week + :queue, :queue_consumer, :beginning_of_week, :filter_redirect attr_writer :log_level attr_reader :encoding @@ -23,6 +23,7 @@ module Rails self.encoding = "utf-8" @consider_all_requests_local = false @filter_parameters = [] + @filter_redirect = [] @helpers_paths = [] @serve_static_assets = true @static_cache_control = nil |