Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
Alexander
|
e7bb762ec2
|
don't stream in benchmark env
|
5 years ago |
Ariadne Conill
|
d1d058bf85
|
streamer: worker: actually use should_send? consistently
|
5 years ago |
Ariadne Conill
|
5a0c018d2a
|
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
|
5 years ago |
Ariadne Conill
|
2417b633ed
|
streamer: add missing copyright headers
|
5 years ago |
Steven Fuchs
|
80c5c3495b
|
remove remaining errors from tests
|
5 years ago |
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126 , reversing
changes made to 4fabf83ad0 .
|
5 years ago |
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |