This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/serializers/rest
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
admin Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
account_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
application_serializer.rb Add vapid_key to the application entity in the REST API (#10058) 2019-02-16 05:27:05 +01:00
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
featured_tag_serializer.rb Add featured tags API (#11778) 2019-09-09 10:50:33 +02:00
filter_serializer.rb Fix filter ID not being a string in REST API (#9303) 2018-11-19 10:37:57 +01:00
identity_proof_serializer.rb squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
instance_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
list_serializer.rb Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
marker_serializer.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment_serializer.rb Add blurhash (#10630) 2019-04-27 03:24:09 +02:00
mute_serializer.rb
notification_serializer.rb Support pushing and receiving updates to poll tallies (#10209) 2019-03-11 00:49:31 +01:00
poll_serializer.rb Add support for custom emojis in poll options (#10322) 2019-03-20 17:29:12 +01:00
preferences_serializer.rb Add a preferences API so apps can share basic behaviours (#10109) 2019-03-15 02:39:20 +01:00
preview_card_serializer.rb
relationship_serializer.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
report_serializer.rb
scheduled_status_serializer.rb Fix wrong param name in scheduled statuses and return params in API (#9725) 2019-01-06 12:03:27 +01:00
search_serializer.rb Remove deprecated `GET /api/v1/search` API (#11823) 2019-09-13 16:11:13 +02:00
status_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
tag_serializer.rb
web_push_subscription_serializer.rb Fix `alerts` booleans not being typecast correctly in push subscription (#11343) 2019-07-21 18:10:07 +02:00