Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.		2024-01-27 19:06:41 +01:00
..
disputes	Misc spec/refactor to user mailer and user mailer spec (#27486)	2023-10-27 09:57:16 +00:00
reports	…
settings	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	Fix report processing notice not mentioning the report number when performing a custom action (#27442)	2023-10-26 17:03:31 +00:00
account_moderation_notes_controller.rb	Remove un-needed `action` and `template` options to `render` in controllers (#28022)	2023-11-29 10:38:05 +00:00
accounts_controller.rb	…
action_logs_controller.rb	Add `Account.auditable` scope, fix N+1 in admin/action_logs#index (#28812)	2024-01-19 01:39:30 +00:00
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	Fix `Style/GuardClause` cop in app/controllers (#28420)	2024-01-25 15:13:41 +00:00
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	Add some more tests and clean up domain block controller (#27469)	2023-10-31 09:40:30 +00:00
email_domain_blocks_controller.rb	Fix remaining `Rails/WhereExists` cop violations, regenerate todo (#28892)	2024-01-25 12:37:07 +00:00
export_domain_allows_controller.rb	File cleanup/organization in `controllers/concerns` (#27846)	2023-11-30 14:39:41 +00:00
export_domain_blocks_controller.rb	Add specs for `Instance` model scopes and add `with_domain_follows` scope (#28767)	2024-01-25 15:28:27 +00:00
follow_recommendations_controller.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
instances_controller.rb	…
invites_controller.rb	…
ip_blocks_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	Remove un-needed `action` and `template` options to `render` in controllers (#28022)	2023-11-29 10:38:05 +00:00
report_notes_controller.rb	Remove un-needed `action` and `template` options to `render` in controllers (#28022)	2023-11-29 10:38:05 +00:00
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
rules_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	…
software_updates_controller.rb	…
statuses_controller.rb	Remove `default_scope` from `StatusEdit` class (#28042)	2023-11-23 09:26:11 +00:00
tags_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…