Merge tag 'v4.3.0'

This commit is contained in:
Mike Barnes 2024-10-09 13:35:26 +11:00
commit e3f2b6bfb8
238 changed files with 2299 additions and 1075 deletions

View file

@ -71,7 +71,8 @@ class User < ApplicationRecord
ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
devise :two_factor_authenticatable,
otp_secret_encryption_key: Rails.configuration.x.otp_secret
otp_secret_encryption_key: Rails.configuration.x.otp_secret,
otp_secret_length: 32
include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method