tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
3d25fe0426
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 glitch-soc theme engine fixes for the challenges controller 2019-09-30 13:37:13 +02:00
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 Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
setup_controller.rb Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00