gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-08 10:02:46 +00:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity
3f60b096b5
mastodon/app/controllers/auth
History
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
2020-07-15 15:32:40 +02: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-07-07 15:58:45 +02:00
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
setup_controller.rb Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00