gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-11 10:32:43 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
16ff7c5627
mastodon/app/controllers/auth
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
challenges_controller.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +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 2018-08-01 00:18:13 +02:00
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
setup_controller.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00