1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 21:59:04 +09:00
YuruToot/app/views/auth
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
challenges Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
confirmations Add some explanation text on the CAPTCHA confirmation page 2022-01-26 13:24:51 +01:00
passwords Add client-side validation in password change forms (#14564) 2020-08-12 12:11:15 +02:00
registrations Add appeals (#17364) 2022-02-14 21:27:53 +01:00
sessions Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
setup Change account deletion page to have better explanations (#11753) 2019-09-04 04:13:54 +02:00
shared Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288) 2022-01-23 15:52:58 +01:00