Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
account_batch.rb	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +02:00
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +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	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	2018-12-25 18:29:51 +01:00
two_factor_confirmation.rb	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)	2017-04-08 22:20:08 +02:00