fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 14:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore default devise secret key behavior

Browse source 
We previously had overridden this to avoid a rails deprecation warning
in regard to how the secret key value is made available:

https://github.com/mastodon/mastodon/pull/28760

Devise recently merged a PR which totally removes the `SecretKeyFinder`:

https://github.com/heartcombo/devise/pull/5645

With merge of this PR we will no longer see the deprecation noise, and
can go back to just using the devise default (which is the same value we
were configuring).
This commit is contained in:
Matt Jankowski 2024-10-23 08:59:53 -04:00
parent 393f0a0159
commit 8b4afd64a7
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/initializers/devise.rb
View file

@ -105,11 +105,9 @@ Devise.setup do |config|
# The secret key used by Devise. Devise uses this key to generate # The secret key used by Devise. Devise uses this key to generate
# random tokens. Changing this key will render invalid all existing # random tokens. Changing this key will render invalid all existing
# confirmation, reset password and unlock tokens in the database. # confirmation, reset password and unlock tokens in the database.
# # Devise will use the `secret_key_base` as its `secret_key`
# Set explicitly to Rails default to avoid deprecation warnings. # by default. You can change it below and use your own secret key.
# https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856 # config.secret_key = '<%= SecureRandom.hex(64) %>'
# Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
config.secret_key = Rails.application.secret_key_base
# ==> Mailer Configuration # ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,