luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-05 22:45:37 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
History
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02:00
..
activitypub Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 2023-07-30 13:49:35 +02:00
nodeinfo Fix nodeinfo metadata attribute being an array instead of an object (#20114) 2022-11-08 17:26:11 +01:00
rest Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
web Update dependency rubocop-rails to v2.20.1 (#25493) 2023-07-13 11:44:02 +02:00
initial_state_serializer.rb Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
manifest_serializer.rb Add maskable icon support for Android (#20904) 2022-11-17 10:52:30 +01:00
oembed_serializer.rb
webfinger_serializer.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00