Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ...

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

2021-05-07 18:21:59 +02:00

..

accept_follow_serializer.rb

…

activity_serializer.rb

…

actor_serializer.rb

Add joined date to profiles in web UI (#16169)

2021-05-07 14:33:19 +02:00

add_serializer.rb

…

block_serializer.rb

…

collection_serializer.rb

Add featured hashtags as an ActivityPub collection (#11595)

2020-09-02 02:11:12 +02:00

delete_actor_serializer.rb

…

delete_serializer.rb

…

device_serializer.rb

…

emoji_serializer.rb

…

encrypted_message_serializer.rb

…

flag_serializer.rb

…

follow_serializer.rb

…

hashtag_serializer.rb

Add featured hashtags as an ActivityPub collection (#11595)

2020-09-02 02:11:12 +02:00

image_serializer.rb

…

like_serializer.rb

…

move_serializer.rb

…

note_serializer.rb

Fix media not being marked sensitive when outgoing CW is set

2020-11-13 01:05:55 +01:00

one_time_key_serializer.rb

…

outbox_serializer.rb

…

public_key_serializer.rb

…

reject_follow_serializer.rb

…

remove_serializer.rb

…

undo_announce_serializer.rb

…

undo_block_serializer.rb

…

undo_follow_serializer.rb

…

undo_like_serializer.rb

…

update_poll_serializer.rb

…

update_serializer.rb

…

vote_serializer.rb

…