Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2023-03-22 19:50:11 +01:00
..
disputes
reports	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
settings
trends
users
webhooks
account_actions_controller.rb	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
account_moderation_notes_controller.rb
accounts_controller.rb	Log admin approve and reject account (#22088)	2022-12-07 00:25:18 +01:00
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
domain_allows_controller.rb
domain_blocks_controller.rb	Remove references to non-existent actions (#24183)	2023-03-20 20:03:44 +01:00
email_domain_blocks_controller.rb	Remove references to non-existent actions (#24183)	2023-03-20 20:03:44 +01:00
export_domain_allows_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
export_domain_blocks_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
follow_recommendations_controller.rb
instances_controller.rb	Add dropdown menu item to open admin interface for remote domains (#21895)	2023-01-05 14:03:46 +01:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb	Allow adding relays while secure mode & limited federation mode are enabled (#22324)	2022-12-15 15:56:05 +01:00
report_notes_controller.rb
reports_controller.rb
resets_controller.rb
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