Claire 8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream fixed a translation bug in the theme selector that is absent from glitch-soc due to our different theming system. Discarded upstream changes. - `streaming/index.js`: Upstream changed the signature of a function to change its return type. This is not a real conflict, the conflict being caused by an extra argument in glitch-soc's code. Applied upstream's change while keeping our extra argument.		2023-06-10 17:18:36 +02:00
..
disputes
reports
settings
trends
users	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
webhooks
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	Remove unused redis_info method Admin::Dashboard (#25345)	2023-06-09 14:03:35 +02:00
domain_allows_controller.rb
domain_blocks_controller.rb	Add a confirmation screen when suspending a domain (#25144)	2023-06-01 09:37:38 +02:00
email_domain_blocks_controller.rb
export_domain_allows_controller.rb
export_domain_blocks_controller.rb
follow_recommendations_controller.rb
instances_controller.rb
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb
report_notes_controller.rb
reports_controller.rb
resets_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
roles_controller.rb
rules_controller.rb
settings_controller.rb
site_uploads_controller.rb
statuses_controller.rb
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb	Add webhook templating (#23289)	2023-06-06 10:42:47 +02:00