Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.		2020-12-19 00:55:12 +01:00
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	Add option to obfuscate domain name in public list of domain blocks (#15355)	2020-12-18 08:30:41 +01:00
email_domain_blocks_controller.rb	…
instances_controller.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
invites_controller.rb	…
ip_blocks_controller.rb	…
pending_accounts_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	…
statuses_controller.rb	Fix slow distinct queries where grouped queries are faster (#15287)	2020-12-07 12:08:30 +01:00
subscriptions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…