Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
actor_serializer.rb	Add profile directory to web UI (#11688)	2019-08-30 00:14:36 +02:00
add_serializer.rb
block_serializer.rb
collection_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
delete_actor_serializer.rb
delete_serializer.rb
emoji_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
flag_serializer.rb
follow_serializer.rb
image_serializer.rb
like_serializer.rb
note_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
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