djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-12-01 12:30:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
34efd1a24c
tootlab-mastodon/app/controllers/settings/two_factor_authentication
History
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
..
confirmations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
otp_authentication_controller.rb Remove unused methods in 2FA OTP Auth Controller (#24220) 2023-04-07 14:13:53 +02:00
recovery_codes_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
webauthn_credentials_controller.rb Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02:00