alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/models/form
History
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
 		2018-12-15 10:45:53 +01:00
..
admin_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
admin_suspension_confirmation.rb Add confirmation step to account suspensions (#8353) 2018-08-22 11:53:41 +02:00
delete_confirmation.rb Account deletion (#3728) 2017-06-14 18:01:27 +02:00
migration.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00
status_batch.rb Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
two_factor_confirmation.rb
…