diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-28 20:04:46 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-28 20:46:01 +0200 |
commit | fbcc4bfe9a211e219da5d0bb01d894fcdaef0a0e (patch) | |
tree | 863d3e1cddc44d80180e7d8594fdad31e59cbe13 /railties/lib | |
parent | 204c0407103ad924c4132636966421c74b49083d (diff) | |
download | rails-fbcc4bfe9a211e219da5d0bb01d894fcdaef0a0e.tar.gz rails-fbcc4bfe9a211e219da5d0bb01d894fcdaef0a0e.tar.bz2 rails-fbcc4bfe9a211e219da5d0bb01d894fcdaef0a0e.zip |
Deprecate secret_token, long since usurped by secret_key_base.
See the changelog entry.
Remove `secrets.secret_token` from the bug report templates,
since we don't accept bug reports for Rails versions that
don't support a `secret_key_base`.
[ claudiob & Kasper Timm Hansen ]
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/application.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 24f5eeae87..4fd20185b1 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -6,6 +6,7 @@ require "active_support/core_ext/object/blank" require "active_support/key_generator" require "active_support/message_verifier" require "active_support/encrypted_configuration" +require "active_support/deprecation" require_relative "engine" require_relative "secrets" @@ -398,6 +399,11 @@ module Rails # Fallback to config.secret_token if secrets.secret_token isn't set secrets.secret_token ||= config.secret_token + if secrets.secret_token.present? + ActiveSupport::Deprecation.warn \ + "`secrets.secret_token` is deprecated in favor of `secret_key_base` and will be removed in Rails 6.0." + end + secrets end end |