me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/controllers/settings/two_factor_authentication
History
Claire f15ded319f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
confirmations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
otp_authentication_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
recovery_codes_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
webauthn_credentials_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00