Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well.		2024-12-25 18:01:37 +01:00
..
admin	…
trends	…
v1	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
account_relationship_severance_event_serializer.rb	Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
account_serializer.rb	…
account_warning_serializer.rb	Add in-app notifications for moderation actions/warnings (#30065)	2024-04-25 17:26:05 +00:00
announcement_serializer.rb	Change `/api/v1/announcements` to return regular `Status` entities (#26736)	2024-04-17 09:06:23 +00:00
annual_report_event_serializer.rb	Add year in review feature to web UI (#32709)	2024-11-05 14:40:07 +00:00
annual_report_serializer.rb	…
annual_reports_serializer.rb	…
appeal_serializer.rb	Add in-app notifications for moderation actions/warnings (#30065)	2024-04-25 17:26:05 +00:00
application_serializer.rb	Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)	2024-05-17 13:46:12 +00:00
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	…
credential_application_serializer.rb	Add client_secret_expires_at to OAuth Applications (#30317)	2024-11-12 22:06:13 +00:00
custom_emoji_serializer.rb	…
dedup_notification_group_serializer.rb	Add option to request partial accounts in grouped notifications API (#31299)	2024-08-06 12:09:35 +00:00
domain_block_preview_serializer.rb	Add preview of followers removed in domain block modal in web UI (#32032)	2024-09-25 18:13:36 +00:00
domain_block_serializer.rb	…
extended_description_serializer.rb	…
familiar_followers_serializer.rb	…
featured_tag_serializer.rb	…
filter_keyword_serializer.rb	…
filter_result_serializer.rb	…
filter_serializer.rb	…
filter_status_serializer.rb	…
instance_serializer.rb	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01:00
language_serializer.rb	…
list_serializer.rb	…
marker_serializer.rb	Rewrite markers reducer in Typescript (#27644)	2024-03-27 12:47:09 +00:00
media_attachment_serializer.rb	Add API types for status and related objects (#29792)	2024-04-02 10:03:33 +00:00
mute_serializer.rb	…
muted_account_serializer.rb	…
notification_group_serializer.rb	Add year in review feature to web UI (#32709)	2024-11-05 14:40:07 +00:00
notification_policy_serializer.rb	Revamp notification policy options (#31343)	2024-08-09 13:30:55 +00:00
notification_request_serializer.rb	…
notification_serializer.rb	Grouped Notifications UI (#30440)	2024-07-18 14:36:09 +00:00
poll_serializer.rb	Add API types for status and related objects (#29792)	2024-04-02 10:03:33 +00:00
preferences_serializer.rb	…
preview_card_serializer.rb	Change `author_account` to be `authors` in REST API (#30846)	2024-06-27 13:17:18 +00:00
privacy_policy_serializer.rb	…
reaction_serializer.rb	…
relationship_serializer.rb	…
report_serializer.rb	…
role_serializer.rb	…
rule_serializer.rb	…
scheduled_status_serializer.rb	Fix `application_id` erroneous inclusion in `ScheduledStatusSerializer` (#33159)	2024-12-17 08:54:07 +00:00
search_serializer.rb	…
status_edit_serializer.rb	…
status_serializer.rb	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
status_source_serializer.rb	…
suggestion_serializer.rb	…
tag_serializer.rb	Add link from Web UI for Hashtags to the Moderation UI (#31448)	2024-11-29 07:36:17 +00:00
translation_serializer.rb	…
web_push_subscription_serializer.rb	…