kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Warn config.derive_keys will be true by default in 4.1

Browse source
This commit is contained in:
Santiago Pastorino 2012-11-01 02:20:16 -02:00
parent 60609bb50d
commit e272000c80
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
railties/lib/rails/application.rb
View file

@ -130,7 +130,14 @@ module Rails
# These parameters will be used by middlewares and engines to configure themselves # These parameters will be used by middlewares and engines to configure themselves
# #
def env_config def env_config
@env_config ||= super.merge({ @env_config ||= begin
if config.secret_token_key.nil?
ActiveSupport::Deprecation.warn "You didn't set config.secret_token_key. " +
"This should be used instead of the old deprecated config.secret_token. " +
"Set config.secret_token_key instead of config.secret_token in config/initializers/secret_token.rb"
end
super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.parameter_filter" => config.filter_parameters,
"action_dispatch.secret_token" => config.secret_token, "action_dispatch.secret_token" => config.secret_token,
"action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions, "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
@ -140,6 +147,7 @@ module Rails
"action_dispatch.key_generator" => key_generator "action_dispatch.key_generator" => key_generator
}) })
end end
end
## Rails internal API ## Rails internal API