Claire cd87d7dcef Merge branch 'main' into glitch-soc/merge-upstream ... - `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.		2022-07-17 22:07:20 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb
actor_serializer.rb
add_serializer.rb
block_serializer.rb
collection_serializer.rb
delete_actor_serializer.rb
delete_serializer.rb
device_serializer.rb
emoji_serializer.rb
encrypted_message_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
flag_serializer.rb
follow_serializer.rb
hashtag_serializer.rb
image_serializer.rb
like_serializer.rb
move_serializer.rb
note_serializer.rb
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