luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-19 16:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
History
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_controller.rb
confirmations_controller.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
omniauth_callbacks_controller.rb Fix undefined variable for Auth::OmniauthCallbacksController (#16654) 2021-08-25 17:40:56 +02:00
passwords_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
registrations_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
sessions_controller.rb
setup_controller.rb