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
05064757d9
mastodon/app/controllers/auth
History
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +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 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
omniauth_callbacks_controller.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
sessions_controller.rb Ensure pack is set when rendering OTP prompt 2019-10-10 17:08:00 +02:00
setup_controller.rb Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00