Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.

2022-01-23 18:24:01 +01:00

..

two_factor

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

new.html.haml

Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)

2022-01-23 15:52:58 +01:00

sign_in_token.html.haml

Add e-mail-based sign in challenge for users with disabled 2FA (#14013)

2020-06-09 10:23:06 +02:00

two_factor.html.haml

Add subresource integrity for JS and CSS assets (#15096)

2020-11-06 11:56:31 +01:00