aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-07-11 04:20:48 -0700
committerJosé Valim <jose.valim@gmail.com>2011-07-11 04:20:48 -0700
commit871d7fad03b2c74edc8b853b9c350aa9f9d24a3d (patch)
treea892695cc0b86302f4a9bb5310c6918ff5ccc1ca /railties/lib
parentc3732bfed01de49947dd0aedd8cc976128b7f5db (diff)
parentea649de669e14a57963113d13508152da2b6aafa (diff)
downloadrails-871d7fad03b2c74edc8b853b9c350aa9f9d24a3d.tar.gz
rails-871d7fad03b2c74edc8b853b9c350aa9f9d24a3d.tar.bz2
rails-871d7fad03b2c74edc8b853b9c350aa9f9d24a3d.zip
Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-default
Put back Rails.application#env_default and deprecate it [Closes #1922]
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index fe29668c72..559739b2ec 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -106,6 +106,15 @@ module Rails
self
end
+ # Rails.application.env_config stores some of the Rails initial environment parameters.
+ # Currently stores:
+ #
+ # * action_dispatch.parameter_filter" => config.filter_parameters,
+ # * action_dispatch.secret_token" => config.secret_token,
+ # * action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
+ #
+ # These parameters will be used by middlewares and engines to configure themselves.
+ #
def env_config
@env_config ||= super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters,