Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.		2022-10-02 18:46:22 +02:00
..
admin	Fix breaking change in admin account API (#19176)	2022-09-15 15:35:06 +02:00
keys
trends
v1	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
account_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
announcement_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
custom_emoji_serializer.rb
encrypted_message_serializer.rb
familiar_followers_serializer.rb
featured_tag_serializer.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
filter_keyword_serializer.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
filter_result_serializer.rb	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
filter_serializer.rb	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
filter_status_serializer.rb	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
instance_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
muted_account_serializer.rb
notification_serializer.rb	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
poll_serializer.rb
preferences_serializer.rb	Fix preferred posting language returning unusable value in REST API (#18428)	2022-05-16 19:13:36 +02:00
preview_card_serializer.rb
reaction_serializer.rb
relationship_serializer.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
report_serializer.rb	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
role_serializer.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
rule_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_edit_serializer.rb
status_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
status_source_serializer.rb
suggestion_serializer.rb
tag_serializer.rb	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
translation_serializer.rb	Add user content translations with configurable backends (#19218)	2022-09-23 23:00:12 +02:00
web_push_subscription_serializer.rb