Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Warn config.derive_keys will be true by default in 4.1

  • Loading branch information...
commit e272000c80548c3de9380bb6c76397d018fb1c68 1 parent 60609bb
@spastorino spastorino authored
Showing with 17 additions and 9 deletions.
  1. +17 −9 railties/lib/rails/application.rb
View
26 railties/lib/rails/application.rb
@@ -130,15 +130,23 @@ def key_generator
# 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,
- "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,
- "action_dispatch.logger" => Rails.logger,
- "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner,
- "action_dispatch.key_generator" => key_generator
- })
+ @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.secret_token" => config.secret_token,
+ "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
+ "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
+ "action_dispatch.logger" => Rails.logger,
+ "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner,
+ "action_dispatch.key_generator" => key_generator
+ })
+ end
end
## Rails internal API
Please sign in to comment.
Something went wrong with that request. Please try again.