Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
This commit is contained in:
Claire
2024-10-06 16:07:58 +02:00
parent 88756ab75f c40ab43dc7
commit b28ce2424c
228 changed files with 2759 additions and 1850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
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