Revert "Merge branch 'streamer-refactoring' into 'develop'"
authorkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)
commitc623b4324deaf236334a0f77a81435b5bffadf3c
tree3e4ed9af085e410ebab1adbb6ecc1d9cd84f3e42
parent4fabf83ad01352442906d79187aeab4c777f4df8
Revert "Merge branch 'streamer-refactoring' into 'develop'"

This reverts merge request !1653
26 files changed:
.gitignore
config/config.exs
lib/pleroma/activity/ir/topics.ex [deleted file]
lib/pleroma/application.ex
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/websocket_handler.ex
lib/pleroma/web/streamer.ex [new file with mode: 0644]
lib/pleroma/web/streamer/ping.ex [deleted file]
lib/pleroma/web/streamer/state.ex [deleted file]
lib/pleroma/web/streamer/streamer.ex [deleted file]
lib/pleroma/web/streamer/streamer_socket.ex [deleted file]
lib/pleroma/web/streamer/supervisor.ex [deleted file]
lib/pleroma/web/streamer/worker.ex [deleted file]
lib/pleroma/web/views/streamer_view.ex [deleted file]
mix.exs
mix.lock
test/activity/ir/topics_test.exs [deleted file]
test/integration/mastodon_websocket_test.exs
test/notification_test.exs
test/support/conn_case.ex
test/support/data_case.ex
test/web/activity_pub/activity_pub_test.exs
test/web/streamer/ping_test.exs [deleted file]
test/web/streamer/state_test.exs [deleted file]
test/web/streamer_test.exs [moved from test/web/streamer/streamer_test.exs with 86% similarity]