mastodon/app/serializers/rest
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
2025-01-10 20:41:36 +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
account_serializer.rb
account_warning_serializer.rb
announcement_serializer.rb
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
application_serializer.rb
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
media_attachment_serializer.rb
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
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 Re-introduce `application_id` in `ScheduledStatusSerializer` (#33505) 2025-01-09 13:38:23 +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