mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 20:40:31 -05:00
656a41db2a
Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.
8 lines
296 B
Plaintext
8 lines
296 B
Plaintext
- content_for :page_title do
|
|
= t('auth.login')
|
|
|
|
- if webauthn_enabled?
|
|
= render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }
|
|
|
|
= render partial: 'auth/sessions/two_factor/otp_authentication_form', locals: { hidden: @scheme_type != 'totp' }
|