Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
exports	File cleanup/organization in `controllers/concerns` (#27846)	2023-11-30 14:39:41 +00:00
migration	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
preferences	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
two_factor_authentication	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
aliases_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
applications_controller.rb	Fix: Mark redirect uris field in Development > Application form as required (#30311)	2024-05-16 07:59:46 +00:00
base_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
deletes_controller.rb	Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053)	2023-11-30 15:43:26 +00:00
exports_controller.rb	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00:00
featured_tags_controller.rb	Add `not_featured_by` scope to Tag (#28815)	2024-04-17 10:05:38 +00:00
flavours_controller.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
imports_controller.rb	Use enum-generated scopes/queries for `BulkImport` (#29975)	2024-04-18 10:13:35 +00:00
login_activities_controller.rb	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
migrations_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	2020-12-30 23:19:18 +01:00
privacy_controller.rb	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
profiles_controller.rb	Add privacy tab in profile settings (#26484)	2023-08-14 18:52:45 +02:00
sessions_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00:00
verifications_controller.rb	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00