You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Add account sensitized (#14361)	4 years ago
action_logs_controller.rb	Add ability to filter audit log in admin UI (#13381)	4 years ago
announcements_controller.rb	Change order of announcements in admin page to sort them newest-first (#15091)	4 years ago
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)	4 years ago
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	Add option to obfuscate domain name in public list of domain blocks (#15355)	4 years ago
email_domain_blocks_controller.rb	Improve email address validation (#14565)	4 years ago
instances_controller.rb	Fix performance on instances list in admin UI (#15282)	4 years ago
invites_controller.rb	…
ip_blocks_controller.rb	Add IP-based rules (#14963)	4 years ago
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	Add ability to delete files uploaded for settings in admin UI (#13192)	4 years ago
statuses_controller.rb	Fix slow distinct queries where grouped queries are faster (#15287)	4 years ago
subscriptions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	4 years ago