Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		2020-01-20 18:31:11 +01:00
..
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
action_logs_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
followers_controller.rb
instances_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
invites_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
pending_accounts_controller.rb
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	2019-09-27 02:13:34 +02:00
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
reported_statuses_controller.rb
reports_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
resets_controller.rb
roles_controller.rb
settings_controller.rb
statuses_controller.rb
subscriptions_controller.rb
tags_controller.rb	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +01:00
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
warning_presets_controller.rb